From 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Feb 2018 19:58:07 +0000 Subject: gentoo resync : 24.02.2018 --- app-office/gnucash/Manifest | 10 +- .../gnucash/files/gnucash-2.7.3-no-gtest-src.patch | 15 -- .../gnucash/files/gnucash-2.7.4-double_free.patch | 12 ++ ...ucash-2.7.4-fix-tests-for-32bit-platforms.patch | 56 +++++++ app-office/gnucash/gnucash-2.6.15-r1.ebuild | 111 -------------- app-office/gnucash/gnucash-2.6.15.ebuild | 112 -------------- app-office/gnucash/gnucash-2.7.3.ebuild | 153 ------------------- app-office/gnucash/gnucash-2.7.4-r1.ebuild | 165 +++++++++++++++++++++ app-office/gnucash/gnucash-2.7.4.ebuild | 155 ------------------- 9 files changed, 236 insertions(+), 553 deletions(-) delete mode 100644 app-office/gnucash/files/gnucash-2.7.3-no-gtest-src.patch create mode 100644 app-office/gnucash/files/gnucash-2.7.4-double_free.patch create mode 100644 app-office/gnucash/files/gnucash-2.7.4-fix-tests-for-32bit-platforms.patch delete mode 100644 app-office/gnucash/gnucash-2.6.15-r1.ebuild delete mode 100644 app-office/gnucash/gnucash-2.6.15.ebuild delete mode 100644 app-office/gnucash/gnucash-2.7.3.ebuild create mode 100644 app-office/gnucash/gnucash-2.7.4-r1.ebuild delete mode 100644 app-office/gnucash/gnucash-2.7.4.ebuild (limited to 'app-office/gnucash') diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest index f125c2485d0b..a675ad95bed9 100644 --- a/app-office/gnucash/Manifest +++ b/app-office/gnucash/Manifest @@ -1,12 +1,8 @@ -AUX gnucash-2.7.3-no-gtest-src.patch 518 BLAKE2B e61dbf22ab7f02af16289bee02ca1617e135d9e92526836efd04952e03ebe7a7e8c8710b174c2b5a9c03565ece674fd04403a146ddba793f9ec02ee4a9b22636 SHA512 d5279af31d454fc71b18c4308cb0d854c1e654190a1c43324d6bd5ab7d91415c4905c008fcd4320ebd49f12236eb43bd60da11d0c6ea6f791f7f6a8ce718e0f4 -DIST gnucash-2.6.15.tar.bz2 13406483 BLAKE2B 927838c5c9c11a19eb9f8e11726825458d5b414f4ef24baf1a7ae15c33825eeed2fd87892e728b37c43385360fd06a60df0bade4244b5c93dac5522f09849c92 SHA512 6ec0652565025ac8281152ed64f2f820ecdb17ead5f17738728e094d116e638a08af57a46c0d5b59679f30f142ce372a5f61bd164f68f6b608d09de37cec38c6 +AUX gnucash-2.7.4-double_free.patch 553 BLAKE2B 3c59299aaf868e52834a8b7c594afedcfde35b7e6058fbe87a8fce57f2773d914b971566c831ae0a998680a3cfc69c5b1c75664087abaf1023e84fd650751592 SHA512 458bf645e16cb88e7ab37b218b442a11b02f6d3eb95fd1c4ae368813bff08bb3455666942c719f17df5348a5c775bc7e0e14507825896463624252aa24a056c9 +AUX gnucash-2.7.4-fix-tests-for-32bit-platforms.patch 1840 BLAKE2B 4de54cb147d563686febad739dddbc7e7e4f1cf92a5f1961fe4ccf452e8e2c495e7a4773a615a77835f4f1ef99d0f5d22c871c1643ada67bec216ae96dff3ce2 SHA512 f89f560e3e6d594836a431831a4a384301e405be49fccece0a761f1d2c17340a68f71ddc8cde4f7e99a2e05e2d3ddc6bda5b59e54ca0baa3a76ac63f7399d48b DIST gnucash-2.6.19.tar.bz2 13612124 BLAKE2B cc66e4d7994274bb2ad97437333dbe62b0e9228e20e05e01fc7861bc45a8f07bc56d2a69850eda301d5e7f679d96a9d28c24c56a4860cff6727b66867482deae SHA512 0a979caf48ba96d6f37a929036e7172855cfb03af8832f479966bce72fad3400903925134d33aaa31eb6b36a2041f5e0d3f74b88e95b83c7d76e96b1503bec13 -DIST gnucash-2.7.3.tar.bz2 13736166 BLAKE2B 352c7bd9fe11b3b1b039acedb43be6f48960fac7ef6e4eaca5ca1ce944808d2d36c3a22b15b7150b8026bad10bfa0766fd19ac8d1b4f5f2cb2bcb8c112ee87bc SHA512 78c482eb3146406d561320866c480101cf35c51d8ab789e8d2688c7f7e16d1870b33feb7bcdb3cd8feaca300ce9bcf9fa05ba8e1804b221526d181763dcea611 DIST gnucash-2.7.4.tar.bz2 13364512 BLAKE2B 0a552efe5a4f024517c054516eb25b51abb2f934e6fc904afd4b0fb48283f9ebb89583b83b0efefba66d014df16c8997c413d05278d4290c44e4fa2278564b61 SHA512 d096ec2a3907dcd09c936f0a49ef6fb5028a17d2e0ade9e68eae7303530480ce19e08c1864efd862d363fda9ef6343260396b794b3c4ac74544baa2628a310eb DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d -EBUILD gnucash-2.6.15-r1.ebuild 3216 BLAKE2B 1989921ba59e5fdf7da887aa85e9a9ad966ab7b037df69fa2827703652e679180762785ef20cc7f0c12b99a20eccb61d4cb30d70a23cc88060690fc55e5ea424 SHA512 8823d1681347cf1f4b52dce75302ca431c0b9b675c5bd6e2e97978237027511acf7f25309755f02d329aa62814881f5df927948c432339c47ef7387ed2bbbe54 -EBUILD gnucash-2.6.15.ebuild 3238 BLAKE2B 5f11f80f426e510fb46e8cdedc0dd9a8ba7f783e5d9eada1185cd4507b34945be105083a28eefacfe91f692e49436cfec3dd7747bd1a60dd87226897cb7e4098 SHA512 00fb4c31296021b9cbb7bc1a83662ff04c89aa5425f4a814ba91cab19ca6ebf8ffd29f60f641770a56b8af48d7ba8c195c0d641c3046e8d2365a841639ef74fb EBUILD gnucash-2.6.19.ebuild 3331 BLAKE2B 67b53dbb60ab5b8160c0e73d3135a200e41f21fd5cfceb7e7f652967af5fcf0381bcd5436f9120fb025bf4ab22a4bd4eae94ac9dacfcdfcda9efec5375fd52d4 SHA512 3c928dd6a952c570f744bae0d843b5dfd48548e12b40c15f73cc4651e49d81989eb845643ec99b175b3eaf01a042f8bf5ceadb02917ea2e998595db0b3e68b8b -EBUILD gnucash-2.7.3.ebuild 3662 BLAKE2B 235d7c3733e37de0db3dc37a15033de21211261945b045bc198519e55e6930b40bcc537525a8c3ef3e34f8585832d1043f671d9c7756ecfcacd080900f61883b SHA512 8cbac0e334419ab2eaa3142438f33b0ecd4b79b991889eef6065b84283f3f70169248fe4fe3a4d146768988ad758d6cbf11b4b6aae553c7fef5b8d028d57f0d7 -EBUILD gnucash-2.7.4.ebuild 3700 BLAKE2B 0aa4f1d0e263f00502d7cc62669235f31815d868c2653fc448dc0434c82eed376346a600f39c00e1f534aea5cec27fdf76b9f452b7f119a6e57612451d9bb965 SHA512 ce2efbac5c39455b836d643c4e383267494ecf27e30f23dd225090076a827d6769dc83eb004c3e30b13023194b9cf1b0ce67e1e8737cc5411c80be96d5a3f3e8 +EBUILD gnucash-2.7.4-r1.ebuild 3952 BLAKE2B 011a368e9bf441c05aaaf3681ed666151ad7a68fb849c2ceca50079f47b91265f9ef10b2cf10367393f3df5243bd59e76c7a2362c3ff498c855058412112c977 SHA512 9cdf9f7b57fa0eda3d5d3d154b194bb869fc360fdac5049e327eedb9b27d91a2e4022a3388d1c372a6d84f337c7d1be96722603e05ac4028073e6a9b7baaadc2 MISC metadata.xml 842 BLAKE2B 32276a0205e3726e5dc547bbac615cb04f1137cf9f34389810921ec6fe55312af21f31732cbfd998a2f1678b06b8f54a16601d0b02e580e3c4a609159f0628dd SHA512 ef6c9aacda5849e8d6a8bc03ff9266fbf38b2256f085b4e4cd3c4a91007f3a4a81740417f18d7f5f437fbf4167de4ffbdb4742e381ded06b12a8433b550ed542 diff --git a/app-office/gnucash/files/gnucash-2.7.3-no-gtest-src.patch b/app-office/gnucash/files/gnucash-2.7.3-no-gtest-src.patch deleted file mode 100644 index 66c1f9fec852..000000000000 --- a/app-office/gnucash/files/gnucash-2.7.3-no-gtest-src.patch +++ /dev/null @@ -1,15 +0,0 @@ -Bug: https://bugs.gentoo.org/643566 - ---- a/common/test-core/Makefile.am -+++ b/common/test-core/Makefile.am -@@ -80,9 +80,9 @@ - libgmock.a - nodist_libgtest_a_SOURCES = ${GTEST_SRC}/src/gtest-all.cc - libgtest_a_CPPFLAGS = ${AM_CPPFLAGS} -I${GTEST_HEADERS} -I${GTEST_SRC} --endif - nodist_libgmock_a_SOURCES = ${GMOCK_SRC_PATH}/gmock-all.cc - libgmock_a_CPPFLAGS = ${libgtest_a_CPPFLAGS} -I${GMOCK_HEADERS} -I${GMOCK_SRC} -+endif - - gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash - gncscmmod_DATA = unittest-support.scm diff --git a/app-office/gnucash/files/gnucash-2.7.4-double_free.patch b/app-office/gnucash/files/gnucash-2.7.4-double_free.patch new file mode 100644 index 000000000000..9d82e72f96b3 --- /dev/null +++ b/app-office/gnucash/files/gnucash-2.7.4-double_free.patch @@ -0,0 +1,12 @@ +diff --git a/libgnucash/core-utils/test/test-userdata-dir.c b/libgnucash/core-utils/test/test-userdata-dir.c +index 5a8cd5c50..a702a56aa 100644 +--- a/libgnucash/core-utils/test/test-userdata-dir.c ++++ b/libgnucash/core-utils/test/test-userdata-dir.c +@@ -338,7 +338,6 @@ main(int argc, char **argv) + + /* Clean up the temporaries that were created for the GNC_DATA_HOME test run */ + g_free (home_dir); +- g_free (tmp_dir); + tmp_dir = g_build_filename(gnc_data_home_dir, "data", (gchar *)NULL); + g_rmdir (tmp_dir); + g_free (tmp_dir); diff --git a/app-office/gnucash/files/gnucash-2.7.4-fix-tests-for-32bit-platforms.patch b/app-office/gnucash/files/gnucash-2.7.4-fix-tests-for-32bit-platforms.patch new file mode 100644 index 000000000000..ec0e83a80bf5 --- /dev/null +++ b/app-office/gnucash/files/gnucash-2.7.4-fix-tests-for-32bit-platforms.patch @@ -0,0 +1,56 @@ +From 3a0d2009741cdf825492020acab7c85867a60589 Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann +Date: Thu, 22 Feb 2018 12:27:36 +0100 +Subject: [PATCH] tests: Skip tests for dates on 32-bit platforms which cannot + be representated + +Tests "test_IANA_Perth_tz" and "test_IANA_Minsk_tz" are failing on 32-bit +platforms because the earliest timestamp which can be representated on a +32-bit platform is "1901-12-13 20:45:52" but the test ranges start before +that date. + +To be safe, this commit will add code to skip tests before year 1902 on +32-bit platforms. + +Bug: https://bugs.gentoo.org/647596 +--- + libgnucash/engine/test/gtest-gnc-timezone.cpp | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/libgnucash/engine/test/gtest-gnc-timezone.cpp b/libgnucash/engine/test/gtest-gnc-timezone.cpp +index 5c46b2618..298220f6e 100644 +--- a/libgnucash/engine/test/gtest-gnc-timezone.cpp ++++ b/libgnucash/engine/test/gtest-gnc-timezone.cpp +@@ -154,6 +154,14 @@ TEST(gnc_timezone_constructors, test_IANA_Perth_tz) + } + else if (year < 1916) + #else ++ if (year < 1902) ++ { ++ // Earliest timestamp which can be represented on a 32-bit ++ // system is "1901-12-13 20:45:52" -- so skip tests until we ++ // reach a year >1901 to be safe ++ continue; ++ } ++ + if (year < 1916) + #endif + { +@@ -216,6 +224,14 @@ TEST(gnc_timezone_constructors, test_IANA_Minsk_tz) + } + else if (year < 1924) + #else ++ if (year < 1902) ++ { ++ // Earliest timestamp which can be represented on a 32-bit ++ // system is "1901-12-13 20:45:52" -- so skip tests until we ++ // reach a year >1901 to be safe ++ continue; ++ } ++ + if (year < 1924) + #endif + { +-- +2.16.2 + diff --git a/app-office/gnucash/gnucash-2.6.15-r1.ebuild b/app-office/gnucash/gnucash-2.6.15-r1.ebuild deleted file mode 100644 index 9cf0d0ea6d36..000000000000 --- a/app-office/gnucash/gnucash-2.6.15-r1.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python2_7 ) - -inherit autotools gnome2 python-single-r1 - -DESCRIPTION="A personal finance manager" -HOMEPAGE="http://www.gnucash.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="chipcard debug +doc gnome-keyring hbci mysql ofx postgres python quotes sqlite" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac) -# libdbi version requirement for sqlite taken from bug #455134 -RDEPEND=" - >=dev-libs/glib-2.32.0:2 - >=dev-libs/popt-1.5 - >=dev-libs/libxml2-2.5.10:2 - dev-libs/libxslt - >=dev-scheme/guile-2.0.0:12=[deprecated,regex] - dev-scheme/guile-www - gnome-base/libgnomecanvas - >=net-libs/webkit-gtk-1.2:2 - >=sys-libs/zlib-1.1.4 - >=x11-libs/gtk+-2.24:2 - >=x11-libs/goffice-0.7.0:0.8[gnome] - x11-libs/pango - gnome-keyring? ( >=app-crypt/libsecret-0.18 ) - ofx? ( >=dev-libs/libofx-0.9.1 ) - hbci? ( >=net-libs/aqbanking-5[gtk,ofx?] - sys-libs/gwenhywfar[gtk] - chipcard? ( sys-libs/libchipcard ) - ) - python? ( ${PYTHON_DEPS} ) - quotes? ( dev-perl/Date-Manip - >=dev-perl/Finance-Quote-1.11 - dev-perl/HTML-TableExtract ) - sqlite? ( >=dev-db/libdbi-0.9.0 - >=dev-db/libdbi-drivers-0.9.0[sqlite] ) - postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) - mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) -" -DEPEND="${RDEPEND} - dev-util/intltool - gnome-base/gnome-common - sys-devel/libtool - virtual/pkgconfig -" -PDEPEND="doc? ( >=app-doc/gnucash-docs-2.2.0 )" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # Skip test that needs some locales to be present - sed -i -e '/test_suite_gnc_date/d' src/libqof/qof/test/test-qof.c || die - - # We need to run eautoreconf to prevent linking against system libs, - # this can be noticed, for example, when updating an old version - # compiled against guile-1.8 to a newer one relying on 2.0 - # https://bugs.gentoo.org/show_bug.cgi?id=590536#c39 - # https://bugzilla.gnome.org/show_bug.cgi?id=775634 - eautoreconf - - gnome2_src_prepare -} - -src_configure() { - local myconf - - DOCS="doc/README.OFX doc/README.HBCI" - - if use sqlite || use mysql || use postgres ; then - myconf+=" --enable-dbi" - else - myconf+=" --disable-dbi" - fi - - # gtkmm is experimental and shouldn't be enabled, upstream bug #684166 - gnome2_src_configure \ - $(use_enable debug) \ - $(use_enable gnome-keyring password-storage) \ - $(use_enable ofx) \ - $(use_enable hbci aqbanking) \ - $(use_enable python) \ - --disable-doxygen \ - --disable-gtkmm \ - --enable-locale-specific-tax \ - --disable-error-on-warning \ - --with-guile=2.0 \ - ${myconf} -} - -src_install() { - # Parallel installation fails from time to time, bug #359123 - # Usually reproducible after removing any gnucash installed copy - MAKEOPTS="${MAKEOPTS} -j1" GNC_DOC_INSTALL_DIR=/usr/share/doc/${PF} \ - gnome2_src_install - - rm -rf "${ED}"/usr/share/doc/${PF}/{examples/,COPYING,INSTALL,*win32-bin.txt,projects.html} - mv "${ED}"/usr/share/doc/${PF} "${T}"/cantuseprepalldocs || die - dodoc "${T}"/cantuseprepalldocs/* -} diff --git a/app-office/gnucash/gnucash-2.6.15.ebuild b/app-office/gnucash/gnucash-2.6.15.ebuild deleted file mode 100644 index 9860cdd822dc..000000000000 --- a/app-office/gnucash/gnucash-2.6.15.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python2_7 ) - -inherit autotools gnome2 python-single-r1 - -DESCRIPTION="A personal finance manager" -HOMEPAGE="http://www.gnucash.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="chipcard debug +doc gnome-keyring hbci mysql ofx postgres python quotes sqlite" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac) -# libdbi version requirement for sqlite taken from bug #455134 -RDEPEND=" - >=dev-libs/glib-2.32.0:2 - >=dev-libs/popt-1.5 - >=dev-libs/libxml2-2.5.10:2 - dev-libs/libxslt - >=dev-scheme/guile-1.8.3:12=[deprecated,regex] - =net-libs/webkit-gtk-1.2:2 - >=sys-libs/zlib-1.1.4 - >=x11-libs/gtk+-2.24:2 - >=x11-libs/goffice-0.7.0:0.8[gnome] - x11-libs/pango - gnome-keyring? ( >=app-crypt/libsecret-0.18 ) - ofx? ( >=dev-libs/libofx-0.9.1 ) - hbci? ( >=net-libs/aqbanking-5[gtk,ofx?] - sys-libs/gwenhywfar[gtk] - chipcard? ( sys-libs/libchipcard ) - ) - python? ( ${PYTHON_DEPS} ) - quotes? ( dev-perl/Date-Manip - >=dev-perl/Finance-Quote-1.11 - dev-perl/HTML-TableExtract ) - sqlite? ( >=dev-db/libdbi-0.9.0 - >=dev-db/libdbi-drivers-0.9.0[sqlite] ) - postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) - mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) -" -DEPEND="${RDEPEND} - dev-util/intltool - gnome-base/gnome-common - sys-devel/libtool - virtual/pkgconfig -" -PDEPEND="doc? ( >=app-doc/gnucash-docs-2.2.0 )" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # Skip test that needs some locales to be present - sed -i -e '/test_suite_gnc_date/d' src/libqof/qof/test/test-qof.c || die - - # We need to run eautoreconf to prevent linking against system libs, - # this can be noticed, for example, when updating an old version - # compiled against guile-1.8 to a newer one relying on 2.0 - # https://bugs.gentoo.org/show_bug.cgi?id=590536#c39 - # https://bugzilla.gnome.org/show_bug.cgi?id=775634 - eautoreconf - - gnome2_src_prepare -} - -src_configure() { - local myconf - - DOCS="doc/README.OFX doc/README.HBCI" - - if use sqlite || use mysql || use postgres ; then - myconf+=" --enable-dbi" - else - myconf+=" --disable-dbi" - fi - - # gtkmm is experimental and shouldn't be enabled, upstream bug #684166 - gnome2_src_configure \ - $(use_enable debug) \ - $(use_enable gnome-keyring password-storage) \ - $(use_enable ofx) \ - $(use_enable hbci aqbanking) \ - $(use_enable python) \ - --disable-doxygen \ - --disable-gtkmm \ - --enable-locale-specific-tax \ - --disable-error-on-warning \ - --with-guile=1.8 \ - ${myconf} -} - -src_install() { - # Parallel installation fails from time to time, bug #359123 - # Usually reproducible after removing any gnucash installed copy - MAKEOPTS="${MAKEOPTS} -j1" GNC_DOC_INSTALL_DIR=/usr/share/doc/${PF} \ - gnome2_src_install - - rm -rf "${ED}"/usr/share/doc/${PF}/{examples/,COPYING,INSTALL,*win32-bin.txt,projects.html} - mv "${ED}"/usr/share/doc/${PF} "${T}"/cantuseprepalldocs || die - dodoc "${T}"/cantuseprepalldocs/* -} diff --git a/app-office/gnucash/gnucash-2.7.3.ebuild b/app-office/gnucash/gnucash-2.7.3.ebuild deleted file mode 100644 index 1dacaa9f6593..000000000000 --- a/app-office/gnucash/gnucash-2.7.3.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# We need to run eautoreconf to prevent linking against system libs, -# this can be noticed, for example, when updating an old version -# compiled against guile-1.8 to a newer one relying on 2.0 -# https://bugs.gentoo.org/show_bug.cgi?id=590536#c39 -# https://bugzilla.gnome.org/show_bug.cgi?id=775634 -GNOME2_EAUTORECONF="yes" -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python2_7 ) - -inherit gnome2 python-single-r1 - -DESCRIPTION="A personal finance manager" -HOMEPAGE="http://www.gnucash.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" - -# Add doc back in for 3.0 and bump app-doc/gnucash-docs -IUSE="aqbanking chipcard debug gnome-keyring mysql nls ofx postgres python - quotes -register2 sqlite" -REQUIRED_USE=" - chipcard? ( aqbanking ) - python? ( ${PYTHON_REQUIRED_USE} )" - -# libdbi version requirement for sqlite taken from bug #455134 -# -# dev-libs/boost must always be built with nls enabled. -RDEPEND=" - >=dev-libs/glib-2.40.0:2 - >=dev-libs/libxml2-2.7.0:2 - >=dev-scheme/guile-2.0.0:12=[regex] - >=sys-libs/zlib-1.1.4 - >=x11-libs/gtk+-3.14.0:3 - dev-libs/boost:=[icu,nls] - dev-libs/icu:= - dev-libs/libxslt - gnome-base/dconf - net-libs/webkit-gtk:4= - aqbanking? ( - >=net-libs/aqbanking-5[gtk,ofx?] - sys-libs/gwenhywfar[gtk] - chipcard? ( sys-libs/libchipcard ) - ) - gnome-keyring? ( >=app-crypt/libsecret-0.18 ) - mysql? ( - dev-db/libdbi - dev-db/libdbi-drivers[mysql] - ) - ofx? ( >=dev-libs/libofx-0.9.1 ) - postgres? ( - dev-db/libdbi - dev-db/libdbi-drivers[postgres] - ) - python? ( ${PYTHON_DEPS} ) - quotes? ( - >=dev-perl/Finance-Quote-1.11 - dev-perl/Date-Manip - dev-perl/HTML-TableExtract - ) - sqlite? ( - >=dev-db/libdbi-0.9.0 - >=dev-db/libdbi-drivers-0.9.0[sqlite] - ) -" - -DEPEND="${RDEPEND} - || ( - >=dev-cpp/gtest-1.8.0 - ( - dev-cpp/gmock - dev-cpp/gtest - ) - ) - dev-lang/perl - dev-perl/XML-Parser - dev-util/intltool - gnome-base/gnome-common - sys-devel/libtool - virtual/pkgconfig -" - -# Uncomment for 3.0 -# PDEPEND="doc? ( -# ~app-doc/gnucash-docs-${PV} -# gnome-extra/yelp -# )" - -# Bug 643566: Conditional didn't enclose everything related to gtest source -# files and they're not needed. -PATCHES=( "${FILESDIR}"/gnucash-2.7.3-no-gtest-src.patch ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local myconf - - if use sqlite || use mysql || use postgres ; then - myconf+=" --enable-dbi" - else - myconf+=" --disable-dbi" - fi - - # As of 2.7.3, the presence of --disable-register2 would enable register2 as - # well. - use register2 && myconf+=" --enable-register2" - - gnome2_src_configure \ - --disable-doxygen \ - --disable-error-on-warning \ - --disable-binreloc \ - $(use_enable nls) \ - $(use_enable debug) \ - $(use_enable gnome-keyring password-storage) \ - $(use_enable aqbanking) \ - $(use_enable ofx) \ - $(use_enable python) \ - ${myconf} -} - -src_test() { - emake check -} - -src_install() { - # Parallel installation fails from time to time, bug #359123 - # Usually reproducible after removing any gnucash installed copy - MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install - - rm "${ED}"/usr/share/doc/${PF}/{COPYING,INSTALL,projects.html} || die - rm "${ED}"/usr/share/doc/${PF}/*win32-bin.txt || die - - use aqbanking && dodoc doc/README.HBCI - use ofx && dodoc doc/README.OFX -} - -pkg_postinst() { - gnome2_pkg_postinst - - ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!" - ewarn - ewarn "GnuCash 2.7.0 introduced large changes in its file format and database" - ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6." - -} diff --git a/app-office/gnucash/gnucash-2.7.4-r1.ebuild b/app-office/gnucash/gnucash-2.7.4-r1.ebuild new file mode 100644 index 000000000000..770723b97a17 --- /dev/null +++ b/app-office/gnucash/gnucash-2.7.4-r1.ebuild @@ -0,0 +1,165 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +# google{test,mock} version +GV="1.8.0" +PYTHON_COMPAT=( python2_7 ) + +inherit cmake-utils gnome2-utils python-single-r1 xdg-utils + +DESCRIPTION="A personal finance manager" +HOMEPAGE="http://www.gnucash.org/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2 + https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="amd64 ~ppc ~ppc64 x86" + +# Add doc back in for 3.0 and bump app-doc/gnucash-docs +IUSE="aqbanking chipcard debug examples gnome-keyring mysql nls ofx postgres + python quotes -register2 sqlite" +REQUIRED_USE=" + chipcard? ( aqbanking ) + python? ( ${PYTHON_REQUIRED_USE} )" + +# libdbi version requirement for sqlite taken from bug #455134 +# +# dev-libs/boost must always be built with nls enabled. +RDEPEND=" + >=dev-libs/glib-2.40.0:2 + >=dev-libs/libxml2-2.7.0:2 + >=dev-scheme/guile-2.0.0:12=[regex] + >=sys-libs/zlib-1.1.4 + >=x11-libs/gtk+-3.14.0:3 + dev-libs/boost:=[icu,nls] + dev-libs/icu:= + dev-libs/libxslt + gnome-base/dconf + net-libs/webkit-gtk:4= + aqbanking? ( + >=net-libs/aqbanking-5[gtk,ofx?] + sys-libs/gwenhywfar[gtk] + chipcard? ( sys-libs/libchipcard ) + ) + gnome-keyring? ( >=app-crypt/libsecret-0.18 ) + mysql? ( + dev-db/libdbi + dev-db/libdbi-drivers[mysql] + ) + ofx? ( >=dev-libs/libofx-0.9.1 ) + postgres? ( + dev-db/libdbi + dev-db/libdbi-drivers[postgres] + ) + python? ( ${PYTHON_DEPS} ) + quotes? ( + >=dev-perl/Finance-Quote-1.11 + dev-perl/Date-Manip + dev-perl/HTML-TableExtract + ) + sqlite? ( + >=dev-db/libdbi-0.9.0 + >=dev-db/libdbi-drivers-0.9.0[sqlite] + ) +" + +DEPEND="${RDEPEND} + ~dev-cpp/gtest-${GV} + dev-lang/perl + dev-perl/XML-Parser + dev-util/intltool + gnome-base/gnome-common + sys-devel/libtool + virtual/pkgconfig +" + +# Uncomment for 3.0 +# PDEPEND="doc? ( +# ~app-doc/gnucash-docs-${PV} +# gnome-extra/yelp +# )" + +PATCHES=( + "${FILESDIR}"/${P}-double_free.patch + "${FILESDIR}"/${P}-fix-tests-for-32bit-platforms.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup + xdg_environment_reset +} + +src_configure() { + local sql_on_off="OFF" + if use mysql || use postgres || use sqlite ; then + sql_on_off="ON" + fi + + local mycmakeargs=( + -DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock + -DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest + + -DDISABLE_NLS=$(usex !nls) + -DENABLE_REGISTER2=$(usex register2) + -DWITH_AQBANKING=$(usex aqbanking) + -DWITH_OFX=$(usex ofx) + -DWITH_PYTHON=$(usex python) + -DWITH_SQL=${sql_on_off} + ) + + cmake-utils_src_configure +} + +src_test() { + if use python ; then + cp common/test-core/unittest_support.py \ + "${BUILD_DIR}"/common/test-core/ || die + fi + + cd "${BUILD_DIR}" || die + XDG_DATA_HOME="${T}/$(whoami)" emake check +} + +src_install() { + cmake-utils_src_install + + rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die + rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die + + if use examples ; then + mv "${ED%/}"/usr/share/doc/gnucash \ + "${ED%/}"/usr/share/doc/${PF}/examples || die + pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die + rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \ + *win32-bin.txt || die + popd > /dev/null || die + docompress -x /usr/share/doc/${PF}/examples/ + else + rm -r "${ED%/}"/usr/share/doc/gnucash || die + fi + + use aqbanking && dodoc doc/README.HBCI + use ofx && dodoc doc/README.OFX +} + +pkg_postinst() { + gnome2_icon_cache_update + gnome2_schemas_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + + ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!" + ewarn + ewarn "GnuCash 2.7.0 introduced large changes in its file format and database" + ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6." +} + +pkg_postrm() { + gnome2_icon_cache_update + gnome2_schemas_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} diff --git a/app-office/gnucash/gnucash-2.7.4.ebuild b/app-office/gnucash/gnucash-2.7.4.ebuild deleted file mode 100644 index a3320783baaf..000000000000 --- a/app-office/gnucash/gnucash-2.7.4.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# google{test,mock} version -GV="1.8.0" -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils gnome2-utils python-single-r1 xdg-utils - -DESCRIPTION="A personal finance manager" -HOMEPAGE="http://www.gnucash.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2 - https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" - -# Add doc back in for 3.0 and bump app-doc/gnucash-docs -IUSE="aqbanking chipcard debug examples gnome-keyring mysql nls ofx postgres - python quotes -register2 sqlite" -REQUIRED_USE=" - chipcard? ( aqbanking ) - python? ( ${PYTHON_REQUIRED_USE} )" - -# libdbi version requirement for sqlite taken from bug #455134 -# -# dev-libs/boost must always be built with nls enabled. -RDEPEND=" - >=dev-libs/glib-2.40.0:2 - >=dev-libs/libxml2-2.7.0:2 - >=dev-scheme/guile-2.0.0:12=[regex] - >=sys-libs/zlib-1.1.4 - >=x11-libs/gtk+-3.14.0:3 - dev-libs/boost:=[icu,nls] - dev-libs/icu:= - dev-libs/libxslt - gnome-base/dconf - net-libs/webkit-gtk:4= - aqbanking? ( - >=net-libs/aqbanking-5[gtk,ofx?] - sys-libs/gwenhywfar[gtk] - chipcard? ( sys-libs/libchipcard ) - ) - gnome-keyring? ( >=app-crypt/libsecret-0.18 ) - mysql? ( - dev-db/libdbi - dev-db/libdbi-drivers[mysql] - ) - ofx? ( >=dev-libs/libofx-0.9.1 ) - postgres? ( - dev-db/libdbi - dev-db/libdbi-drivers[postgres] - ) - python? ( ${PYTHON_DEPS} ) - quotes? ( - >=dev-perl/Finance-Quote-1.11 - dev-perl/Date-Manip - dev-perl/HTML-TableExtract - ) - sqlite? ( - >=dev-db/libdbi-0.9.0 - >=dev-db/libdbi-drivers-0.9.0[sqlite] - ) -" - -DEPEND="${RDEPEND} - ~dev-cpp/gtest-${GV} - dev-lang/perl - dev-perl/XML-Parser - dev-util/intltool - gnome-base/gnome-common - sys-devel/libtool - virtual/pkgconfig -" - -# Uncomment for 3.0 -# PDEPEND="doc? ( -# ~app-doc/gnucash-docs-${PV} -# gnome-extra/yelp -# )" - -pkg_setup() { - use python && python-single-r1_pkg_setup - xdg_environment_reset -} - -src_configure() { - local sql_on_off="OFF" - if use mysql || use postgres || use sqlite ; then - sql_on_off="ON" - fi - - local mycmakeargs=( - -DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock - -DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest - - -DDISABLE_NLS=$(usex !nls) - -DENABLE_REGISTER2=$(usex register2) - -DWITH_AQBANKING=$(usex aqbanking) - -DWITH_OFX=$(usex ofx) - -DWITH_PYTHON=$(usex python) - -DWITH_SQL=${sql_on_off} - ) - - cmake-utils_src_configure -} - -src_test() { - cd "${BUILD_DIR}" || die - emake check -} - -src_install() { - cmake-utils_src_install - - rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die - rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die - - if use examples ; then - mv "${ED%/}"/usr/share/doc/gnucash \ - "${ED%/}"/usr/share/doc/${PF}/examples || die - pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die - rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \ - *win32-bin.txt || die - popd > /dev/null || die - docompress -x /usr/share/doc/${PF}/examples/ - else - rm -r "${ED%/}"/usr/share/doc/gnucash || die - fi - - use aqbanking && dodoc doc/README.HBCI - use ofx && dodoc doc/README.OFX -} - -pkg_postinst() { - gnome2_icon_cache_update - gnome2_schemas_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - - ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!" - ewarn - ewarn "GnuCash 2.7.0 introduced large changes in its file format and database" - ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6." -} - -pkg_postrm() { - gnome2_icon_cache_update - gnome2_schemas_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} -- cgit v1.2.3