Version bump, bug #392317 by José Romildo Malaquias.

Package-Manager: portage-2.1.10.38/cvs/Linux x86_64

diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index e78c71213be37d2928fca2ef6832d29313b73332..6704dfae23a3e9870648a4c697f4b3113d54d099 100644 (file)
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/gnucash
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.248 2011/11/22 00:48:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.249 2011/11/30 15:13:19 pacho Exp $
+
+*gnucash-2.4.8 (30 Nov 2011)
+
+  30 Nov 2011; Pacho Ramos <pacho@gentoo.org>
+  +files/gnucash-2.4.8-python-detection.patch, +gnucash-2.4.8.ebuild:
+  Version bump, bug #392317 by José Romildo Malaquias.
 
   22 Nov 2011; Pacho Ramos <pacho@gentoo.org>
   -files/gnucash-2.4.5-link-system-libs.patch, -gnucash-2.4.5.ebuild,

diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 8aa7f947d607e08b26f96c3fdaf90df7fba7b256..cf3e5fb7de7169807953417182f150e23c709916 100644 (file)
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA1
 
 AUX gnucash-2.4.7-python-detection.patch 1960 RMD160 fdd2282fd3f594770d873647562cfde54c6285ee SHA1 47b3355f0db503e4dcf3403d53eff56f874810e5 SHA256 9f7cb480ac23ec33bf2547786cc362ecb0151500f68785c0cb437e727f5a5e5d
+AUX gnucash-2.4.8-python-detection.patch 1945 RMD160 0026503ccc8c1094806dd222c01f9aa6446d6e95 SHA1 5f2a84b3f5e328457b1af2db5ab35ef55c0803df SHA256 649491376f5fa2aae65e918981eee3b25e3d99bc1a83c612e5b8e86429bf947a
 DIST gnucash-2.4.7.tar.bz2 9297876 RMD160 678db346d2a0d3f019d7435ac3cf17df96ac7c1a SHA1 e99dd56949de27c19d9c3413d30c87a0f74e8ff9 SHA256 eeb3b17f9081a544f8705db735df88ab3f468642a1d01552ea4e36bcb5b0730e
+DIST gnucash-2.4.8.tar.bz2 9345232 RMD160 030c5948e188765900bb5736c398f8d5ee6641d4 SHA1 cdd8793bc8e8cbb433a0237007023f4973a51781 SHA256 4aa11e7746bb5105682a223f9baf97200ecf2a1fcddbf871626805ac097fee19
 EBUILD gnucash-2.4.7.ebuild 3936 RMD160 17472e9906b63ee38b45f5b906fb3b2ba996fc93 SHA1 063cd896a8ef26006b2a508c6a033638bb792714 SHA256 4efa49a4ec7c79a62b99b384b5ef0143132cbf0b9be0501d50f116d7dd6919a8
-MISC ChangeLog 36073 RMD160 106f8a72a99b27e7ff294fc01960a971238358b9 SHA1 dc6260b382f68659772bdeda6749e554107878a9 SHA256 0580710d2988cb28a022f7825ae0c1285db18f65f5c954f6770ee55cb5ce31e5
+EBUILD gnucash-2.4.8.ebuild 3874 RMD160 cea90d43ff8cc68ce2d3450326094b010d379861 SHA1 7d80297a77f386c5cf6b5a8b7039afaad51e9ecc SHA256 d6a9713c1989b8a958f4b7a692cb6011c848877df765dd68584d268d0267b60d
+MISC ChangeLog 36276 RMD160 2fb7376ff3a0cd119b34920313fa1e42289a4f6c SHA1 0c7a3b561fd0b772abf11f0c27f888f99520c606 SHA256 dcc314fafd6877a086484bc2e41d3a640c6389531aca61ee5020920376cdd932
 MISC metadata.xml 535 RMD160 c99ee40df2a1ff8e640e37e97bc26aafd7c95935 SHA1 0aa73584b27064001bad7f76ebaf799947c03bb8 SHA256 5696960b05fe025efabc8cffe84f7978a0a1ca23d04a9b0ec4a23b6aaefd0b28
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7K8UUACgkQCaWpQKGI+9T+/wCbBVVodjfLQ9zZgdCJNZLSLAnI
-cVsAn1MQ0ROR9jzsHoCwVv+LXYpfK9mW
-=V7Zh
+iEYEARECAAYFAk7WSBUACgkQCaWpQKGI+9QNqwCfQ9ZhclmE0wN//eC9bVOjUsry
+1jwAn2bBhVBhnZmSnPQb14IynWRIcFZa
+=Nsj0
 -----END PGP SIGNATURE-----

diff --git a/app-office/gnucash/files/gnucash-2.4.8-python-detection.patch b/app-office/gnucash/files/gnucash-2.4.8-python-detection.patch
new file mode 100644 (file)
index 0000000..fa691d3
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-2.4.8-python-detection.patch
@@ -0,0 +1,45 @@
+--- macros/ac_python_devel.m4~ 2011-10-17 18:53:34.000000000 +0200
++++ macros/ac_python_devel.m4  2011-11-30 15:17:45.978799588 +0100
+@@ -20,14 +20,8 @@
+ 
+       # Check for Python include path
+       AC_MSG_CHECKING([for Python include path])
+-      python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
+-      for i in "$python_path/include/python$PYTHON_VERSION/" "$python_path/include/python/" "$python_path/" ; do
+-              python_path=`find -L $i -type f -name Python.h -print | sed "1q"`
+-              if test -n "$python_path" ; then
+-                      break
+-              fi
+-      done
+-      python_path=`echo $python_path | sed "s,/Python.h$,,"`
++      python_path=`$PYTHON -c 'import distutils.sysconfig; \
++              print(distutils.sysconfig.get_python_inc())'`
+       AC_MSG_RESULT([$python_path])
+       if test -z "$python_path" ; then
+               AC_MSG_ERROR([cannot find Python include path])
+@@ -36,21 +30,16 @@
+ 
+       # Check for Python library path
+       AC_MSG_CHECKING([for Python library path])
+-      python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
+-      for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do
+-              python_path=`find -L $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
+-              if test -n "$python_path" ; then
+-                      break
+-              fi
+-      done
+-      python_path=`echo $python_path | sed "s,/libpython.*$,,"`
++      python_path=`$PYTHON -c 'import distutils.sysconfig; \
++              print(distutils.sysconfig.get_config_var("LIBDIR"))'`
+       AC_MSG_RESULT([$python_path])
+       if test -z "$python_path" ; then
+               AC_MSG_ERROR([cannot find Python library path])
+       fi
+       AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -lpython$PYTHON_VERSION"])
+       #
+-      python_site=`echo $python_path | sed "s/config/site-packages/"`
++      python_site=`$PYTHON -c 'import distutils.sysconfig; \
++              print(distutils.sysconfig.get_python_lib(standard_lib=False))'`
+       AC_SUBST([PYTHON_SITE_PKG],[$python_site])
+       #
+       # libraries which must be linked in when embedding

diff --git a/app-office/gnucash/gnucash-2.4.8.ebuild b/app-office/gnucash/gnucash-2.4.8.ebuild
new file mode 100644 (file)
index 0000000..903f2e5
--- /dev/null
+++ b/app-office/gnucash/gnucash-2.4.8.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.4.8.ebuild,v 1.1 2011/11/30 15:13:19 pacho Exp $
+
+EAPI="4"
+GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="python? 2:2.4"
+
+inherit gnome2 python eutils autotools
+
+DOC_VER="2.2.0"
+
+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 cxx debug +doc hbci mysql ofx postgres python quotes sqlite webkit"
+
+# FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
+RDEPEND=">=dev-libs/glib-2.13:2
+       >=dev-libs/popt-1.5
+       >=dev-libs/libxml2-2.5.10:2
+       >=dev-scheme/guile-1.8.3:12[deprecated,regex]
+       dev-scheme/guile-www
+       >=dev-scheme/slib-3.1.4
+       >=gnome-base/gconf-2:2
+       >=gnome-base/libgnomeui-2.4
+       >=gnome-base/libglade-2.4:2.0
+       gnome-base/libgnome-keyring
+       media-libs/libart_lgpl
+       >=sys-libs/zlib-1.1.4
+       >=x11-libs/gtk+-2.14:2
+       x11-libs/goffice:0.8[gnome]
+       x11-libs/pango
+       cxx? ( dev-cpp/gtkmm:2.4 )
+       ofx? ( >=dev-libs/libofx-0.9.1 )
+       hbci? ( >=net-libs/aqbanking-5[gtk]
+               sys-libs/gwenhywfar[gtk]
+               chipcard? ( sys-libs/libchipcard )
+       )
+       quotes? ( dev-perl/DateManip
+               >=dev-perl/Finance-Quote-1.11
+               dev-perl/HTML-TableExtract )
+       webkit? ( net-libs/webkit-gtk:2 )
+       !webkit? ( >=gnome-extra/gtkhtml-3.16:3.14 )
+       sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite3] )
+       postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] )
+       mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] )
+"
+DEPEND="${RDEPEND}
+       >=app-text/scrollkeeper-0.3
+       dev-util/pkgconfig
+       dev-util/intltool
+       gnome-base/gnome-common
+       sys-devel/libtool
+"
+
+PDEPEND="doc? ( >=app-doc/gnucash-docs-${DOC_VER} )"
+
+pkg_setup() {
+       DOCS="doc/README.OFX doc/README.HBCI"
+
+       if use webkit ; then
+               G2CONF+=" --with-html-engine=webkit"
+       else
+               G2CONF+=" --with-html-engine=gtkhtml"
+       fi
+
+       if use sqlite || use mysql || use postgres ; then
+               G2CONF+=" --enable-dbi"
+       else
+               G2CONF+=" --disable-dbi"
+       fi
+
+       G2CONF+="
+               $(use_enable cxx gtkmm)
+               $(use_enable debug)
+               $(use_enable ofx)
+               $(use_enable hbci aqbanking)
+               $(use_enable python python-bindings)
+               --disable-doxygen
+               --enable-locale-specific-tax
+               --disable-error-on-warning"
+
+       if use python ; then
+               python_set_active_version 2
+       fi
+}
+
+src_configure() {
+       # guile wrongly exports LDFLAGS as LIBS which breaks modules
+       # Filter until a better ebuild is available, bug #202205
+       local GUILE_LIBS=""
+       local lib
+       for lib in $(guile-config link); do
+               if [ "${lib#-Wl}" = "$lib" ]; then
+                       GUILE_LIBS="$GUILE_LIBS $lib"
+               fi
+       done
+
+       econf GUILE_LIBS="${GUILE_LIBS}" ${G2CONF}
+}
+
+src_prepare() {
+       : > "${S}"/py-compile
+
+       use python && python_convert_shebangs -r 2 .
+
+       # Disable python binding tests because of missing file
+       sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
+               -i src/optional/python-bindings/Makefile.{am,in} \
+               || die "python tests sed failed"
+
+       # Find python in a faster way, bug #344231, upstream bug #665203
+       epatch "${FILESDIR}/${PN}-2.4.8-python-detection.patch"
+
+       intltoolize --force --copy --automake || die "intltoolize failed"
+       eautoreconf
+       gnome2_src_prepare
+}
+
+src_test() {
+       unset DBUS_SESSION_BUS_ADDRESS
+       GUILE_WARN_DEPRECATED=no \
+       GNC_DOT_DIR="${T}"/.gnucash \
+       emake check
+}
+
+src_install() {
+       # Parallel installation fails from time to time, bug #359123
+       MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install GNC_DOC_INSTALL_DIR=/usr/share/doc/${PF}
+
+       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/*
+}
+
+pkg_postinst() {
+       gnome2_pkg_postinst
+       use python && python_mod_optimize gnucash
+}
+
+pkg_postrm() {
+       gnome2_pkg_postrm
+       use python && python_mod_cleanup gnucash
+}