Version bump, find python in a faster way, bug #344231, thanks a lot to Arfrever...
authorPacho Ramos <pacho@gentoo.org>
Mon, 29 Aug 2011 15:59:50 +0000 (15:59 +0000)
committerPacho Ramos <pacho@gentoo.org>
Mon, 29 Aug 2011 15:59:50 +0000 (15:59 +0000)
Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

app-office/gnucash/ChangeLog
app-office/gnucash/Manifest
app-office/gnucash/files/gnucash-2.4.7-python-detection.patch [new file with mode: 0644]
app-office/gnucash/gnucash-2.4.7.ebuild [new file with mode: 0644]

index 0ac4da28b77d600a721dce5825b14a94c68b06b2..1ce3aa29f217b7117cd90b792d2c8bd1216f7ac9 100644 (file)
@@ -1,6 +1,13 @@
 # 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.242 2011/07/24 10:59:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.243 2011/08/29 15:59:50 pacho Exp $
+
+*gnucash-2.4.7 (29 Aug 2011)
+
+  29 Aug 2011; Pacho Ramos <pacho@gentoo.org> +gnucash-2.4.7.ebuild,
+  +files/gnucash-2.4.7-python-detection.patch:
+  Version bump, find python in a faster way, bug #344231, thanks a lot to
+  Arfrever Frehtes Taifersar Arahesis and Ed Catmur for their help.
 
   24 Jul 2011; Raúl Porcel <armin76@gentoo.org> gnucash-2.4.5.ebuild,
   gnucash-2.4.6.ebuild:
index 439185e25990498257ae27902272ebb59f268111..fdb2f5655f5ef6cbea495b7b3e93a19867415b34 100644 (file)
@@ -2,16 +2,19 @@
 Hash: SHA1
 
 AUX gnucash-2.4.5-link-system-libs.patch 578 RMD160 4dbed2bc8018f6d4766fae03b7d924e407d93723 SHA1 009321ff8b72dce3681cf452aa1cde6c1afc4d25 SHA256 b0509fa4079ff0db9611fd714042ef11419a29bb7536385b174dbb49d0cc0391
+AUX gnucash-2.4.7-python-detection.patch 1960 RMD160 fdd2282fd3f594770d873647562cfde54c6285ee SHA1 47b3355f0db503e4dcf3403d53eff56f874810e5 SHA256 9f7cb480ac23ec33bf2547786cc362ecb0151500f68785c0cb437e727f5a5e5d
 DIST gnucash-2.4.5.tar.bz2 9264705 RMD160 ae475c31f18bdd4edb3e8c72951b09942f19acdc SHA1 4f40b039ee8e9bcc15d49a8ed52bd7ef94bc8126 SHA256 edc76109ca6cc31ee02734d4dd129d1177bc4b4e6de40e7de9e5752fc38faf92
 DIST gnucash-2.4.6.tar.bz2 9302034 RMD160 af0f19749b38040c28f45ea0746a52cad3703d96 SHA1 b6d4a6bc327ef5a260d070215a14a3180b474ad8 SHA256 c764668e9c947fdea60456f54d912c73b6a4c603b617c683e497cb7a94dbda57
+DIST gnucash-2.4.7.tar.bz2 9297876 RMD160 678db346d2a0d3f019d7435ac3cf17df96ac7c1a SHA1 e99dd56949de27c19d9c3413d30c87a0f74e8ff9 SHA256 eeb3b17f9081a544f8705db735df88ab3f468642a1d01552ea4e36bcb5b0730e
 EBUILD gnucash-2.4.5.ebuild 3952 RMD160 55eb97f401b5e609c10ec6b7e17527491154ff72 SHA1 b04fc432e3da9bbe03fa2e3f18d85045663d8412 SHA256 dd8857449a464e70bcda4761a3f644bc6eac756239486134e9e2e299486ba909
 EBUILD gnucash-2.4.6.ebuild 3589 RMD160 b4260ada0215c13921223d3a94f55273eb74052c SHA1 29f6a5393a47c4879349d520b916755998957bcf SHA256 c1f907cb6641c73381974b9a6cb4cebb96650ce31a369e3690670dc39ff9c33e
-MISC ChangeLog 35188 RMD160 0a0e24003f190b7687c24562ed1a9033d51aed34 SHA1 e6899aa33fbc142b7bda8f463d2c9fc166b8cb36 SHA256 649788cfd806b31bf4493271bc14ae7c86268b573c727e8c40abd2224ce69ed1
+EBUILD gnucash-2.4.7.ebuild 3809 RMD160 2d32b411d137634a7f12f31c4a6a45f037573694 SHA1 c926c9d55f44c01de5e9062c5204ecaff018a7f2 SHA256 3234d32eb9a7145b4146feb4529f0e3b3db4abaded3cc0afc50ad9e12ca07fc9
+MISC ChangeLog 35475 RMD160 0c535414126d9ee54feb0dac7fd68da4bbf880f5 SHA1 acba7fbac742faffe16fd09dd8480103ea15970e SHA256 8c9268159f3ea92a0030247d6a66b8079b9112eebbc73a646df7c3596f3d66f1
 MISC metadata.xml 535 RMD160 c99ee40df2a1ff8e640e37e97bc26aafd7c95935 SHA1 0aa73584b27064001bad7f76ebaf799947c03bb8 SHA256 5696960b05fe025efabc8cffe84f7978a0a1ca23d04a9b0ec4a23b6aaefd0b28
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4r+xUACgkQuQc30/atMkCEkQCgqAkUiePiheVv86sdptci6LOp
-USsAn2egrXJYE9gKq5uRNW/7ivp+XjKX
-=ydan
+iEYEARECAAYFAk5bt3wACgkQCaWpQKGI+9T8uQCfcQ4imsz1/mfCDJ3p1QU1QQGr
+V4kAn19kXoh8bXqWg5E1B4NxxCpI7fmY
+=cku5
 -----END PGP SIGNATURE-----
diff --git a/app-office/gnucash/files/gnucash-2.4.7-python-detection.patch b/app-office/gnucash/files/gnucash-2.4.7-python-detection.patch
new file mode 100644 (file)
index 0000000..71db107
--- /dev/null
@@ -0,0 +1,45 @@
+--- a/macros/ac_python_devel.m4        
++++ a/macros/ac_python_devel.m4        
+@@ -20,14 +20,8 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
+       # 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 $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 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
+       # 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 $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.7.ebuild b/app-office/gnucash/gnucash-2.4.7.ebuild
new file mode 100644 (file)
index 0000000..745a764
--- /dev/null
@@ -0,0 +1,142 @@
+# 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.7.ebuild,v 1.1 2011/08/29 15:59:50 pacho Exp $
+
+EAPI="3"
+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.in)
+
+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/gnome-keyring-2.29 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() {
+       gnome2_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 #????
+       epatch "${FILESDIR}/${PN}-2.4.7-python-detection.patch"
+
+       intltoolize --force --copy --automake || die "intltoolize failed"
+       eautoreconf
+}
+
+src_test() {
+       unset DBUS_SESSION_BUS_ADDRESS
+       GUILE_WARN_DEPRECATED=no \
+       GNC_DOT_DIR="${T}"/.gnucash \
+       emake check \
+       || die "Make check failed. See above for details."
+}
+
+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/* || die
+}