From 15df7f5fd5e5349120e330646eea00d86154151c Mon Sep 17 00:00:00 2001 From: Torsten Veller Date: Wed, 20 Feb 2008 12:26:53 +0000 Subject: [PATCH] Remove old ebuilds. Fixed guile and slib dependency. Package-Manager: portage-2.1.4.4 --- app-office/gnucash/ChangeLog | 6 +- app-office/gnucash/Manifest | 23 +--- .../gnucash/files/gnucash-2.2.2-goffice.patch | 24 ---- .../gnucash/files/gnucash-2.2.2-icons.patch | 39 ------ .../files/gnucash-2.2.2-sx-fix-r16766.patch | 19 --- app-office/gnucash/gnucash-2.0.5.ebuild | 123 ------------------ app-office/gnucash/gnucash-2.2.2-r1.ebuild | 110 ---------------- app-office/gnucash/gnucash-2.2.3.ebuild | 6 +- 8 files changed, 10 insertions(+), 340 deletions(-) delete mode 100644 app-office/gnucash/files/gnucash-2.2.2-goffice.patch delete mode 100644 app-office/gnucash/files/gnucash-2.2.2-icons.patch delete mode 100644 app-office/gnucash/files/gnucash-2.2.2-sx-fix-r16766.patch delete mode 100644 app-office/gnucash/gnucash-2.0.5.ebuild delete mode 100644 app-office/gnucash/gnucash-2.2.2-r1.ebuild diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog index bf07ad8775dc..51866506d817 100644 --- a/app-office/gnucash/ChangeLog +++ b/app-office/gnucash/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/gnucash # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.153 2008/02/19 19:58:32 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.154 2008/02/20 12:26:52 tove Exp $ + + 20 Feb 2008; Torsten Veller -gnucash-2.0.5.ebuild, + -gnucash-2.2.2-r1.ebuild, gnucash-2.2.3.ebuild: + Remove old ebuilds. Fixed guile and slib dependencies. 19 Feb 2008; Christoph Mende gnucash-2.2.3.ebuild: Stable on amd64, bug #210471 diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest index a8f32fafc24d..d6e595a9c4f0 100644 --- a/app-office/gnucash/Manifest +++ b/app-office/gnucash/Manifest @@ -1,23 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX gnucash-2.2.2-goffice.patch 948 RMD160 fdc2541d1f2f470cc8303f43141b9aeadd1f1b40 SHA1 52df4fba4920a5b84e1fc3170d0cb368bc1e5d0c SHA256 430851c641e1150f5a0e8c73df029928b386bddd5b34bc3ed7b269efecd29dcd -AUX gnucash-2.2.2-icons.patch 1289 RMD160 02926143b16dad015ab07915871ce9b6081b2ed1 SHA1 183c8a062248197dfaa978bf8c3fe7f7d0b1e82c SHA256 845522f0a056695e803b7e1fb74ead63846480bb4b5bdd1223d59c38e3c02a48 -AUX gnucash-2.2.2-sx-fix-r16766.patch 796 RMD160 289d03783fbfcc24c925e8023cdd8de8f219c466 SHA1 f923e39e760afd8aecad2ac6a8b461c16e81f662 SHA256 24790ffbb1e81395b09c97dbadd17979352a7d90c02fd60879283c99581a8a57 -DIST gnucash-2.0.5.tar.bz2 7372056 RMD160 b3d853f376143121f29b14ff81d09e044183584f SHA1 802ac3c8fd6f2448bad96a78b20c8fec9d6b89ad SHA256 b7e2efcdc79ba864a1730af9e0197cdbf586c9008196eaffffce8f020f1fb479 -DIST gnucash-2.2.2.tar.bz2 7076072 RMD160 e64602283ccd51f0298a7ee637a49742932e5e3d SHA1 157b4ac6f211ab82041fa6a0b9a5bf93ffda2aac SHA256 66a4c54d2f1784826d3a44e27e237d36aeff6009e58eef6a31f340b68201086e DIST gnucash-2.2.3.tar.bz2 6949569 RMD160 2f1d56c6cd7a31689bd3e879b96abcb5feeb38ae SHA1 67cbc2c462fe96f753b6aa6394915e2f04884ef6 SHA256 c52c73477cf4b37c07dd25abafeaa63b74e0d2168f2b7469081ed31092a545f2 -DIST gnucash-docs-2.0.1.tar.bz2 9262237 RMD160 f2b00a5ce745921ea4e8a2360baff13aaf3fc083 SHA1 ce04f51e8eeb8324b7abca6bf84ddb18562cf6b4 SHA256 f39e6248fef20c761c74b534024869952e26b98879930b3a675178fd3d5260ff -DIST gnucash-icon.svg.bz2 5046 RMD160 e9389e5d2468416c5d2168ce30fb4ff57dd27872 SHA1 f14697723a5a2b88acf4420b2b107a8578c398c7 SHA256 a679c12477536b5f43c01d0448ddfe03de195d9954bfebc087bba1f549214d71 -EBUILD gnucash-2.0.5.ebuild 3391 RMD160 b96f5a3d2be402307a0fa23d48be48de5e5c6777 SHA1 8b49b6ba46fe26d6adc8906827126e03e97dc548 SHA256 78f3c6eb86f879fc1d30c399267b5ec1604be821c1112453282ab90cc4c8d9fa -EBUILD gnucash-2.2.2-r1.ebuild 2954 RMD160 4215cf808941aa38fe38cb240e59f5802ce0ae11 SHA1 97eda6a658592a2624ff15cd2d89a181eb12b262 SHA256 3a042a7a6e3d8bbaf6699137d5d6630ed25b93b2f9c625489968ac1e642b844a -EBUILD gnucash-2.2.3.ebuild 2655 RMD160 6c163a7f759245fec4944967ed6e9b5efe9e3fd5 SHA1 2bfd48fa542cc30af80800b0b807fa84a4b7b345 SHA256 efe90ebd05b920befba5fdc696619789468691dbcd7fd6759dddc7ce2253c5c7 -MISC ChangeLog 23211 RMD160 f15235df38c73db212935d26a33ec42e69dacd62 SHA1 998636e0d9c404e97afc08d61beb43bc6d4399ff SHA256 6e2fbee1ebe34f77bd0f51b49d4a3702f0777397f36f21c465c9c51b2467f247 +EBUILD gnucash-2.2.3.ebuild 2581 RMD160 965c12875eb566617116eabf97259395f336117e SHA1 4fa265e6cced91ad185b5e6fecc52be9384f8ede SHA256 8e7aedf2cdc840089d4fa881b3e22da96d591f0cfdf979bb554f293b72bf49d0 +MISC ChangeLog 23387 RMD160 160474959cccc85ccf35ed0df063f62c1ff09d22 SHA1 def38d28ceb6d55e8175086c52aeb51f887d45c2 SHA256 1a19341882ad4513c24e19c0a52d5f0e7249348f6342a2b80c9537f920742117 MISC metadata.xml 255 RMD160 eed2a430ff95a969fb224cec79676fc1651de745 SHA1 7f6701628873130644bd55c3898c8baf59279c74 SHA256 8405513ba61307253676b41faad6234e851a4d136c47fb92fb08eab1d5f0ea76 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.7 (GNU/Linux) - -iD8DBQFHuzTuKhnDs22gwa8RAi8TAJ903zsQf1TscEPoQAOiZMj51egZkwCguBr4 -7TMFtyzTwZ3gQFuNKp0gnc4= -=dZH/ ------END PGP SIGNATURE----- diff --git a/app-office/gnucash/files/gnucash-2.2.2-goffice.patch b/app-office/gnucash/files/gnucash-2.2.2-goffice.patch deleted file mode 100644 index 35638a76430b..000000000000 --- a/app-office/gnucash/files/gnucash-2.2.2-goffice.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: gnucash/trunk/configure.in -=================================================================== ---- gnucash/trunk/configure.in (revision 16816) -+++ gnucash/trunk/configure.in (revision 16834) -@@ -1115,13 +1115,13 @@ - goffice=0 - goffice_with_cairo=0 -- PKG_CHECK_MODULES(GOFFICE, libgoffice-0.5 >= 0.5.1, [ -+ PKG_CHECK_MODULES(GOFFICE, libgoffice-0.6 >= 0.6.0, [goffice=1], [ -+ PKG_CHECK_MODULES(GOFFICE, libgoffice-0.5 >= 0.5.1, [goffice=1], [goffice=0]) -+ ]) -+ if test x$goffice = x1 -+ then - AC_DEFINE(HAVE_GOFFICE_0_5,1,[System has goffice 0.5.1 or better]) - AC_DEFINE(GOFFICE_WITH_CAIRO,1,[GOffice has been built with cairo support]) -- goffice=1 - goffice_with_cairo=1 -- ], [goffice=0]) -- -- if test x$goffice = x0 -- then -+ else - PKG_CHECK_MODULES(GOFFICE, libgoffice-0.4 >= 0.4.0, [goffice=1], [ - PKG_CHECK_MODULES(GOFFICE, libgoffice-0.3 >= 0.3.0, [goffice=1], [ diff --git a/app-office/gnucash/files/gnucash-2.2.2-icons.patch b/app-office/gnucash/files/gnucash-2.2.2-icons.patch deleted file mode 100644 index 47a28e00f3b4..000000000000 --- a/app-office/gnucash/files/gnucash-2.2.2-icons.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- src/pixmaps/Makefile.am 2007-12-18 11:25:57.000000000 +0100 -+++ src/pixmaps/Makefile.am 2007-12-18 11:33:13.000000000 +0100 -@@ -36,10 +36,31 @@ - stock_split_title.png \ - stock_split_watermark.png - --gncicondir = ${datadir}/pixmaps --gncicon_DATA = gnucash-icon-16x16.png \ -- gnucash-icon-32x32.png \ -- gnucash-icon-48x48.png -+gncnormalicondir = ${datadir}/icons/hicolor/48x48/apps -+gncnormalicon_DATA = 48x48/gnucash-icon.png -+48x48/gnucash-icon.png: gnucash-icon-48x48.png -+ -mkdir 48x48 -+ cp gnucash-icon-48x48.png 48x48/gnucash-icon.png -+ -+gncmediumicondir = ${datadir}/icons/hicolor/32x32/apps -+gncmediumicon_DATA = 32x32/gnucash-icon.png -+32x32/gnucash-icon.png: gnucash-icon-32x32.png -+ -mkdir 32x32 -+ cp gnucash-icon-32x32.png 32x32/gnucash-icon.png -+ -+gncsmallicondir = ${datadir}/icons/hicolor/16x16/apps -+gncsmallicon_DATA = 16x16/gnucash-icon.png -+16x16/gnucash-icon.png: gnucash-icon-16x16.png -+ -mkdir 16x16 -+ cp gnucash-icon-16x16.png 16x16/gnucash-icon.png -+ -+gncsvgicondir = ${datadir}/icons/hicolor/scalable/apps -+gncsvgicon_DATA = gnucash-icon.svg - - EXTRA_DIST = \ -- ${gncpixmap_DATA} ${gncicon_DATA} -+ ${gncpixmap_DATA} \ -+ ${gncnormalicon_DATA} ${gncmediumicon_DATA} ${gncsmallicon_DATA} \ -+ ${gncsvgicon_DATA} -+ -+clean-local: -+ -rm -rf 48x48 32x32 16x16 diff --git a/app-office/gnucash/files/gnucash-2.2.2-sx-fix-r16766.patch b/app-office/gnucash/files/gnucash-2.2.2-sx-fix-r16766.patch deleted file mode 100644 index 3bfb9458c1e0..000000000000 --- a/app-office/gnucash/files/gnucash-2.2.2-sx-fix-r16766.patch +++ /dev/null @@ -1,19 +0,0 @@ -http://svn.gnucash.org/trac/changeset/16766 -Index: /gnucash/trunk/src/app-utils/gnc-sx-instance-model.c -=================================================================== ---- /gnucash/trunk/src/app-utils/gnc-sx-instance-model.c (revision 16670) -+++ /gnucash/trunk/src/app-utils/gnc-sx-instance-model.c (revision 16766) -@@ -262,5 +262,5 @@ - { - Account *template_root, *sx_template_acct; -- char sx_guid_str[GUID_ENCODING_LENGTH]; -+ char sx_guid_str[GUID_ENCODING_LENGTH+1]; - - template_root = gnc_book_get_template_root(gnc_get_current_book()); -@@ -924,5 +924,5 @@ - if (*split_acct == NULL) - { -- char guid_str[GUID_ENCODING_LENGTH]; -+ char guid_str[GUID_ENCODING_LENGTH+1]; - GString *err; - guid_to_string_buff((const GUID*)acct_guid, guid_str); diff --git a/app-office/gnucash/gnucash-2.0.5.ebuild b/app-office/gnucash/gnucash-2.0.5.ebuild deleted file mode 100644 index a808d4af090d..000000000000 --- a/app-office/gnucash/gnucash-2.0.5.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.0.5.ebuild,v 1.15 2007/07/21 12:14:32 tove Exp $ - -inherit eutils gnome2 - -DOC_VER="2.0.1" - -DESCRIPTION="A personal finance manager." -HOMEPAGE="http://www.gnucash.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2 - mirror://sourceforge/${PN}/${PN}-docs-${DOC_VER}.tar.bz2" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="alpha amd64 ppc sparc x86" - -IUSE="ofx hbci chipcard doc debug quotes nls" - -RDEPEND=">=dev-libs/glib-2.4.0 - dev-scheme/guile - ~dev-scheme/slib-3.1.1-r1 - >=sys-libs/zlib-1.1.4 - >=dev-libs/popt-1.5 - >=x11-libs/gtk+-2.4 - >=gnome-base/libgnomeui-2.4 - >=gnome-base/libgnomeprint-2.10 - >=gnome-base/libgnomeprintui-2.10 - >=gnome-base/libglade-2.4 - || ( - =gnome-extra/gtkhtml-3.12* - =gnome-extra/gtkhtml-3.10* - ) - >=dev-libs/libxml2-2.5.10 - =dev-libs/g-wrap-1.9.6* - >=gnome-base/gconf-2 - >=app-text/scrollkeeper-0.3 - >=x11-libs/goffice-0.0.4 - gnome-extra/yelp - ofx? ( >=dev-libs/libofx-0.7.0 ) - hbci? ( net-libs/aqbanking - chipcard? ( sys-libs/libchipcard ) - ) - quotes? ( dev-perl/DateManip - >=dev-perl/Finance-Quote-1.11 - dev-perl/HTML-TableExtract ) - app-text/docbook-xsl-stylesheets - =app-text/docbook-xml-dtd-4.1.2* - nls? ( dev-util/intltool )" - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen - media-gfx/graphviz - virtual/tetex ) - dev-util/pkgconfig" - -pkg_setup() { - built_with_use gnome-extra/libgsf gnome || die "gnome-extra/libgsf must be built with gnome" - built_with_use x11-libs/goffice gnome || die "x11-libs/goffice must be built with gnome" - - if has_version =dev-scheme/guile-1.8*; then - local flags="deprecated regex" - if ! built_with_use dev-scheme/guile ${flags}; then - einfo "guile must be built with \"${flags}\" use flags" - die "guile must be built with \"${flags}\" use flags" - fi - fi -} - -src_compile() { - - local myconf - - if use doc ; then - myconf="${myconf} --enable-latex-docs" - fi - - econf \ - $(use_enable debug) \ - $(use_enable ofx) \ - $(use_enable doc doxygen) \ - $(use_enable doc html-docs) \ - $(use_enable doc dot) \ - $(use_enable hbci) \ - $(use_enable hbci mt940) \ - --enable-locale-specific-tax \ - ${myconf} || die "econf failed" - - MAKEOPTS="-j1" - emake || die "emake failed" - - cd "${WORKDIR}/gnucash-docs-${DOC_VER}" - econf || die "doc econf failed" - emake || die "doc emake failed" -} - -src_test() { - einfo "Skipping tests because one of the upstream tests is broken" - einfo "Please reference: https://bugs.gentoo.org/show_bug.cgi?id=146769#c1" - einfo "We have a filed a bug upstream. When that is resolved," - einfo "We will re-enable the tests." -} - -# See http://bugs.gentoo.org/show_bug.cgi?id=132862 regarding gconf schema install - -src_install() { - gnome2_src_install || die "gnome2_src_install failed" - dodoc AUTHORS ChangeLog* DOCUMENTERS HACKING INSTALL NEWS TODO README* doc/README* - make_desktop_entry ${P} "GnuCash ${PV}" gnucash-icon.png "GNOME;Office;Finance" - - cd "${WORKDIR}/${PN}-docs-${DOC_VER}" - make DESTDIR="${D}" \ - scrollkeeper_localstate_dir="${D}/var/lib/scrollkeeper" \ - install || die "doc install failed" - rm -rf "${D}/var/lib/scrollkeeper" -} - -pkg_postinst() { - gnome2_pkg_postinst - elog "Please note that postgresql support has been removed." - elog "Please see: https://bugs.gentoo.org/show_bug.cgi?id=146769#c9" - elog "for an explanation." -} diff --git a/app-office/gnucash/gnucash-2.2.2-r1.ebuild b/app-office/gnucash/gnucash-2.2.2-r1.ebuild deleted file mode 100644 index 8e6dae619f6e..000000000000 --- a/app-office/gnucash/gnucash-2.2.2-r1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.2.2-r1.ebuild,v 1.2 2008/01/08 06:56:05 tove Exp $ - -inherit autotools eutils gnome2 - -DOC_VER="2.2.0" - -DESCRIPTION="A personal finance manager." -HOMEPAGE="http://www.gnucash.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2 - mirror://gentoo/${PN}-icon.svg.bz2" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" - -IUSE="ofx hbci chipcard debug quotes" - -RDEPEND=">=dev-libs/glib-2.6.3 - || ( ( >=dev-scheme/guile-1.8.3 >=dev-scheme/slib-3.1.4 ) - ( =sys-libs/zlib-1.1.4 - >=dev-libs/popt-1.5 - >=x11-libs/gtk+-2.10 - >=gnome-base/libgnomeui-2.4 - >=gnome-base/libgnomeprint-2.10 - >=gnome-base/libgnomeprintui-2.10 - >=gnome-base/libglade-2.4 - >=gnome-extra/gtkhtml-3.14 - >=dev-libs/libxml2-2.5.10 - >=gnome-base/gconf-2 - >=app-text/scrollkeeper-0.3 - >=x11-libs/goffice-0.6 - ofx? ( >=dev-libs/libofx-0.7.0 ) - hbci? ( net-libs/aqbanking - chipcard? ( sys-libs/libchipcard ) - ) - quotes? ( dev-perl/DateManip - >=dev-perl/Finance-Quote-1.11 - dev-perl/HTML-TableExtract ) - dev-util/intltool - media-libs/libart_lgpl - x11-libs/pango" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - sys-devel/libtool" - -PDEPEND=">=app-doc/gnucash-docs-${DOC_VER}" -ELTCONF="--patch-only" -DOC="AUTHORS ChangeLog* DOCUMENTERS HACKING NEWS TODO README* doc/README*" - -pkg_setup() { - local will_die=false - local flags="deprecated regex" - if ! built_with_use --missing true dev-scheme/guile ${flags} ; then - eerror "dev-scheme/guile must be built with \"${flags}\" use flags" - will_die=true - fi - if ! built_with_use gnome-extra/libgsf gnome ; then - eerror "gnome-extra/libgsf must be built with gnome use flag" - will_die=true - fi - if ! built_with_use x11-libs/goffice gnome ; then - eerror "x11-libs/goffice must be built with gnome use flag" - will_die=true - fi - - if ${will_die} ; then - die "Please rebuild the packages with the use flags above." - fi -} - -src_unpack() { - unpack ${A} - cp "${WORKDIR}"/gnucash-icon.svg "${S}"/src/pixmaps || die - cd "${S}" - epatch "${FILESDIR}"/${P}-icons.patch - epatch "${FILESDIR}"/${P}-sx-fix-r16766.patch - epatch "${FILESDIR}"/${P}-goffice.patch - AT_M4DIR=macros eautoreconf -} - -src_compile() { - econf \ - $(use_enable debug) \ - $(use_enable ofx) \ - $(use_enable hbci) \ - --disable-doxygen \ - --enable-locale-specific-tax \ - --disable-error-on-warning \ - || die "econf failed" - emake -j1 || die "emake failed" -} - -src_test() { - GUILE_WARN_DEPRECATED=no \ - emake -j1 check \ - || die "Make check failed. See above for details." -} - -pkg_postinst() { - gnome2_pkg_postinst - ewarn "" - ewarn "If you are using Scheduled Transactions, the data file saved by" - ewarn "GnuCash 2.2 is NOT backward-compatible with GnuCash 2.0." - ewarn "Please make a safe backup of your 2.0 data before upgrading to 2.2" - ewarn "" -} diff --git a/app-office/gnucash/gnucash-2.2.3.ebuild b/app-office/gnucash/gnucash-2.2.3.ebuild index 0d34fdada218..fa8fafe5f816 100644 --- a/app-office/gnucash/gnucash-2.2.3.ebuild +++ b/app-office/gnucash/gnucash-2.2.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.2.3.ebuild,v 1.6 2008/02/19 19:58:32 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.2.3.ebuild,v 1.7 2008/02/20 12:26:52 tove Exp $ inherit autotools eutils gnome2 @@ -17,8 +17,8 @@ KEYWORDS="alpha amd64 ppc sparc x86" IUSE="ofx hbci chipcard debug quotes" RDEPEND=">=dev-libs/glib-2.6.3 - || ( ( >=dev-scheme/guile-1.8.3 >=dev-scheme/slib-3.1.4 ) - ( =dev-scheme/guile-1.8.3 + >=dev-scheme/slib-3.1.4 >=sys-libs/zlib-1.1.4 >=dev-libs/popt-1.5 >=x11-libs/gtk+-2.10 -- 2.26.2