diff options
Diffstat (limited to 'app-office/dia')
| -rw-r--r-- | app-office/dia/ChangeLog | 8 | ||||
| -rw-r--r-- | app-office/dia/Manifest | 16 | ||||
| -rw-r--r-- | app-office/dia/dia-0.97-r1.ebuild | 104 | ||||
| -rw-r--r-- | app-office/dia/dia-0.97.1.ebuild | 9 | ||||
| -rw-r--r-- | app-office/dia/files/dia-0.97-automagic-libemf.patch | 63 | ||||
| -rw-r--r-- | app-office/dia/files/dia-0.97-fix-bashism.patch | 60 |
6 files changed, 20 insertions, 240 deletions
diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog index 815aa153a043..1e67b4951e4f 100644 --- a/app-office/dia/ChangeLog +++ b/app-office/dia/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/dia # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.127 2010/03/09 19:57:07 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.128 2010/05/16 09:40:12 eva Exp $ + + 16 May 2010; Gilles Dartiguelongue <eva@gentoo.org> -dia-0.97-r1.ebuild, + dia-0.97.1.ebuild, -files/dia-0.97-automagic-libemf.patch, + -files/dia-0.97-fix-bashism.patch: + Fix homepage URL, bug #319797. Also remove unneeded *.la files. Clean up + old revision. 09 Mar 2010; Joseph Jezak <josejx@gentoo.org> dia-0.97.1.ebuild: Marked ppc stable for bug #257020. diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest index 79fe2fd60cf5..f70afacef67d 100644 --- a/app-office/dia/Manifest +++ b/app-office/dia/Manifest @@ -2,19 +2,15 @@ Hash: SHA1 AUX dia-0.97-acinclude-python-fixes.patch 2524 RMD160 0383fe7394fa1dc21fc734e39077b5f743ec0987 SHA1 054b6a43a4cb6dc7243dfa2fa7d6412687bf07e9 SHA256 a4c56ee5b05c01253936b7f9ed4d5b796e8f00a5148e94f7b9bba598595e484c -AUX dia-0.97-automagic-libemf.patch 1837 RMD160 c376aec16206770e563109a4b21aa1df0af172cc SHA1 1228ec728fa5e2b789bd8d0e652342683dcdba2c SHA256 dbefca0dcd1dcba1a0f9d7806367cfd6702bf2c9ddd3b71ca432ac219b605409 -AUX dia-0.97-fix-bashism.patch 2108 RMD160 1aea51e0f753de6d61c8431cfac07de955ff7901 SHA1 711f28ad8dcff816ba78cf7121795dfee49fe4b2 SHA256 f915fe62981b5433ebf126c2d5b1c66e02265be93ff0a1773d114da2be02a874 AUX dia-0.97.0-gnome-doc.patch 1961 RMD160 ccc2b5273b8fe030294041ca3277ad28cec8bea6 SHA1 13ee9f0923ecf48b5fbf3e5cf7448ea8985c4bfb SHA256 5a0161a8da6991c65eb85cda4fbb00e65d897a13ab17ca2d1924167d316fa7a6 DIST dia-0.97.1.tar.bz2 6836081 RMD160 e6c3cd2872aa7d0bd8ffa502577027d7f45c8982 SHA1 ea35e0e0f2f75b69e22faa38968e0803a8ab4f47 SHA256 8dfe8b2c9d87baf29834c8de5e3ec91497c2b17f2b77fb1b867afddf5c429142 -DIST dia-0.97.tar.bz2 6736670 RMD160 1b2869e2ebdd2f37b908ab3166e529aec1862af6 SHA1 1c5a727e9e4f59b823a4616fc881055006eb8b96 SHA256 9083382bd5435b6d6324fc601f359a7c759504e48adbcece0a7d5c45a76ccf5a -EBUILD dia-0.97-r1.ebuild 2537 RMD160 473f0b62a6071132a8db520a1939030bad644c9d SHA1 96b975af924862d41df4028d1a2c12a7c31db808 SHA256 f0a058df4337624b431dcacfec3a82378e5ead7e27a40fbbe7e300307098b7ef -EBUILD dia-0.97.1.ebuild 2442 RMD160 4491251f043778aa3b821e82faf4fa1411a39bd1 SHA1 851fb14aff5ead00c419e271dee6dc7c25414c54 SHA256 535f0b3a3addba996b6342c136fa62649f75a645680df6a7793a250b9bbd950a -MISC ChangeLog 16636 RMD160 aae69f4f3ab9bf012569f58dff71837a7edf0922 SHA1 ab56306608667f08c82e349235bb1d0e348448fe SHA256 3bc1a4c534c3a44a20d16400d3bb2d67f7a7549cdd39ef79cc61aa590616c375 +EBUILD dia-0.97.1.ebuild 2534 RMD160 820b2e98b8df7266df8255f376be48d0762ac5b6 SHA1 3b2a39402aebe96fd9c278607ff92d35994230fe SHA256 8cc251e0fc36b020770a28860b4f46969ea6b739b4f28630b99b9f34f888ca7e +MISC ChangeLog 16898 RMD160 5ae18bdebe6c90925aad75b9d2d03729d79c2392 SHA1 5b2df1e80d151ca088b32119ff6e810034f6e7d7 SHA256 db2067d23f3ef271d444e549b1496004ab5d8568dd84135749c0a234f81336f2 MISC metadata.xml 578 RMD160 f6c695b300f590287280f5d79e363e83e4f066d7 SHA1 a621978dd1772191b84c756071af83cea2e76436 SHA256 9f701216a4674db9adcda07b71c272954d60cbb8764e09052db999436287766c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkuWqAAACgkQcsIHjyDViGQXdQCfZdhLNisRqjZct3I7SyivqW5G -qEEAoL2O8FODEKcro9l2G411wOrvciQa -=ncAU +iEYEARECAAYFAkvvvYgACgkQ1fmVwcYIWAbY7ACglaNu9NmOhmlhsBDknsQu2ZxD +u6AAoMXXOiwjbBB6kEMlIwYNFSrU+86W +=QJbi -----END PGP SIGNATURE----- diff --git a/app-office/dia/dia-0.97-r1.ebuild b/app-office/dia/dia-0.97-r1.ebuild deleted file mode 100644 index 2f3d53488558..000000000000 --- a/app-office/dia/dia-0.97-r1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97-r1.ebuild,v 1.8 2010/03/07 21:11:29 eva Exp $ - -EAPI="2" - -inherit eutils gnome2 libtool autotools versionator python - -MY_P=${P/_/-} -DESCRIPTION="Diagram/flowchart creation program" -HOMEPAGE="http://www.gnome.org/projects/dia/" -LICENSE="GPL-2" - -# dia used -1 instead of .1 for the new version. -MY_PV_MM=$(get_version_component_range 1-2) -SRC_URI="mirror://gnome/sources/${PN}/${MY_PV_MM}/${MY_P}.tar.bz2" - -SLOT="0" -KEYWORDS="ppc" -# the doc USE flag doesn't seem to do anything without docbook2html -# FIXME: configure mixes debug and devel meaning (see -DGTK_DISABLE...) -IUSE="cairo doc gnome png python zlib" - -RDEPEND=">=x11-libs/gtk+-2.6.0 - >=dev-libs/glib-2.6.0 - >=x11-libs/pango-1.8 - >=dev-libs/libxml2-2.3.9 - >=dev-libs/libxslt-1 - >=media-libs/freetype-2.0.95 - dev-libs/popt - zlib? ( sys-libs/zlib ) - png? ( - media-libs/libpng - >=media-libs/libart_lgpl-2 ) - gnome? ( - >=gnome-base/libgnome-2.0 - >=gnome-base/libgnomeui-2.0 ) - cairo? ( >=x11-libs/cairo-1 ) - python? ( - >=dev-lang/python-1.5.2 - >=dev-python/pygtk-1.99 ) - doc? ( - ~app-text/docbook-xml-dtd-4.5 - app-text/docbook-xsl-stylesheets )" - -DEPEND="${RDEPEND} - >=dev-util/intltool-0.35.0 - dev-util/pkgconfig - doc? ( dev-libs/libxslt )" - -DOCS="AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO" - -pkg_setup() { - G2CONF="${G2CONF} - $(use_with cairo) - $(use_with python) - $(use_enable doc db2html) - $(use_enable gnome) - --disable-libemf - --without-swig - --without-hardbooks - --disable-static - --docdir=/usr/share/doc/${PF}" -} - -src_prepare() { - gnome2_src_prepare - - # Fix compilation in a gnome environment, bug #159831 - epatch "${FILESDIR}/${PN}-0.97.0-gnome-doc.patch" - - # Fix compilation with USE="python", bug #271855 - if use python; then - epatch "${FILESDIR}/${P}-acinclude-python-fixes.patch" - fi - - # Skip man generation - if ! use doc; then - sed -i -e '/if HAVE_DB2MAN/,/endif/d' doc/*/Makefile.am \ - || die "sed 2 failed" - fi - - # Fix automagic libEMF, bug #276148 - epatch "${FILESDIR}/${P}-automagic-libemf.patch" - - # Fix bashism - epatch "${FILESDIR}/${P}-fix-bashism.patch" - - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf -} - -pkg_postinst() { - gnome2_pkg_postinst - if use python; then - python_need_rebuild - python_mod_optimize /usr/share/dia - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - python_mod_cleanup /usr/share/dia -} diff --git a/app-office/dia/dia-0.97.1.ebuild b/app-office/dia/dia-0.97.1.ebuild index 5d7f52fd6eed..72510f271cdd 100644 --- a/app-office/dia/dia-0.97.1.ebuild +++ b/app-office/dia/dia-0.97.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.1.ebuild,v 1.8 2010/03/09 19:57:07 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.1.ebuild,v 1.9 2010/05/16 09:40:12 eva Exp $ EAPI="2" @@ -8,7 +8,7 @@ inherit eutils gnome2 libtool autotools versionator python MY_P=${P/_/-} DESCRIPTION="Diagram/flowchart creation program" -HOMEPAGE="http://www.gnome.org/projects/dia/" +HOMEPAGE="http://live.gnome.org/Dia" LICENSE="GPL-2" # dia used -1 instead of .1 for the new version. @@ -84,6 +84,11 @@ src_prepare() { eautoreconf } +src_install() { + gnome2_src_install + find "${D}" -name "*.la" -delete || die "failed to remove *.la" +} + pkg_postinst() { gnome2_pkg_postinst if use python; then diff --git a/app-office/dia/files/dia-0.97-automagic-libemf.patch b/app-office/dia/files/dia-0.97-automagic-libemf.patch deleted file mode 100644 index d23c05b1bab2..000000000000 --- a/app-office/dia/files/dia-0.97-automagic-libemf.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 8e41f38007b46f1a1da655b81acd88fc491df59e Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Tue, 14 Jul 2009 20:17:18 +0200 -Subject: [PATCH] Make libemf plugin optional. - ---- - configure.in | 36 +++++++++++++++++++++++------------- - 1 files changed, 23 insertions(+), 13 deletions(-) - -diff --git a/configure.in b/configure.in -index 11f3705..cc5d3aa 100644 ---- a/configure.in -+++ b/configure.in -@@ -214,23 +214,33 @@ AC_SUBST(PNG_LIBS) - LIBS="${old_LIBS} ${PNG_LIBS}" - - dnl check for libEMF to provide Windows Metafile plug-in on Linux --old_CPPFLAGS="${CPPFLAGS}" --old_CFLAGS="${CFLAGS}" --old_LIBS="${LIBS}" --CPPFLAGS="${CPPFLAGS} -I /usr/include/libEMF" --AC_CHECK_HEADER(emf.h, emf_ok=yes, emf_ok=no) --AC_CHECK_LIB(EMF, CreateEnhMetaFileWithFILEW, , emf_ok=no, -lstdc++) --if test "$emf_ok" = yes; then -- LIBEMF_CFLAGS='-I /usr/include/libEMF' -- LIBEMF_LIBS='-lEMF -lstdc++' -- AC_DEFINE(HAVE_LIBEMF,1,[libEMF library available]) -+AC_ARG_ENABLE([libemf], -+ AS_HELP_STRING([--enable-libemf], [enable plugin for windows metafile support]), -+ , -+ enable_libemf=yes) -+ -+if test "$enable_libemf" = "yes"; then -+ old_CPPFLAGS="${CPPFLAGS}" -+ old_CFLAGS="${CFLAGS}" -+ old_LIBS="${LIBS}" -+ -+ CPPFLAGS="${CPPFLAGS} -I /usr/include/libEMF" -+ AC_CHECK_HEADER(emf.h, emf_ok=yes, emf_ok=no) -+ AC_CHECK_LIB(EMF, CreateEnhMetaFileWithFILEW, , emf_ok=no, -lstdc++) -+ -+ if test "$emf_ok" = yes; then -+ LIBEMF_CFLAGS='-I /usr/include/libEMF' -+ LIBEMF_LIBS='-lEMF -lstdc++' -+ AC_DEFINE(HAVE_LIBEMF,1,[libEMF library available]) -+ fi -+ -+ CPPFLAGS="${old_CPPFLAGS}" -+ CFLAGS="${old_CFLAGS}" -+ LIBS="${old_LIBS}" - fi - AC_SUBST(LIBEMF_CFLAGS) - AC_SUBST(LIBEMF_LIBS) - AM_CONDITIONAL(WITH_LIBEMF, test "$emf_ok" = yes) --CPPFLAGS="${old_CPPFLAGS}" --CFLAGS="${old_CFLAGS}" --LIBS="${old_LIBS}" - - dnl - dnl Debugging --- -1.6.3.3 - diff --git a/app-office/dia/files/dia-0.97-fix-bashism.patch b/app-office/dia/files/dia-0.97-fix-bashism.patch deleted file mode 100644 index 21d62a5508dc..000000000000 --- a/app-office/dia/files/dia-0.97-fix-bashism.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 8d1b50c5c8441a24bb5b6c38637155ebe2976c06 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Tue, 14 Jul 2009 19:57:25 +0200 -Subject: [PATCH] Fix bashism - ---- - configure.in | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure.in b/configure.in -index d9c0bf4..11f3705 100644 ---- a/configure.in -+++ b/configure.in -@@ -61,7 +61,7 @@ PKG_CHECK_MODULES(PANGOVERSION, pango >= 1.8.0, , - - AC_ARG_WITH(freetype, - [ --without-freetype compile without FreeType support],,with_freetype=yes) --if test "x$with_freetype" == "xyes"; then -+if test "x$with_freetype" = "xyes"; then - PKG_CHECK_MODULES(PANGOFT2,pangoft2,have_pangoft2=true,have_pangoft2=false) - if test "$have_pangoft2" = "true"; then - dnl On Solaris with Forte C, at least, need to link app/dia with -lfreetype. -@@ -149,7 +149,7 @@ AM_CONDITIONAL(WITH_CAIRO, test "x$with_cairo" != "xno") - - dnl with gtk+ >= 2.8 this is no longer optional - PKG_CHECK_MODULES(PANGOCAIRO,pangocairo, pangocairo_ok=yes, pangocairo_ok=no) --if test "x$pangocairo_ok" == "xyes"; then -+if test "x$pangocairo_ok" = "xyes"; then - AC_DEFINE(HAVE_PANGOCAIRO_H,1,[Defined to render text with pangocairo not cairos toy API]) - fi - -@@ -260,7 +260,7 @@ AC_SUBST(GETTEXT_PACKAGE) - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Needed for glib gettext]) - - AC_CHECK_PROG(XGETTEXT, xgettext, xgettext, none) --if test "$XGETTEXT" == none ; then -+if test "$XGETTEXT" = none ; then - AC_MSG_ERROR([xgettext program not found: $XGETTEXT.]) - fi - -@@ -487,14 +487,14 @@ dnl - dnl use jw only if we don't find dblatex - dnl - AC_PATH_PROG(JW,jw,no) --if test "x$dblatex" == "xno"; then -+if test "x$dblatex" = "xno"; then - AM_CONDITIONAL(WITH_JW, test "x$jw" != "xno") - else - AM_CONDITIONAL(WITH_JW, test "xno" != "xno") - fi - hardbook_ok=no - xsltproc_ok=no --if test "x$with_hardbooks" == "xno"; then -+if test "x$with_hardbooks" = "xno"; then - AM_CONDITIONAL(WITH_JW, test "xno" != "xno") - AM_CONDITIONAL(WITH_HTMLDOC, test "xno" != "xno") - AM_CONDITIONAL(WITH_PDFDOC, test "xno" != "xno") --- -1.6.3.3 - |