Version bump, find python in a faster way, bug #344231, thanks a lot to Arfrever Frehtes Taifersar Arahesis and Ed Catmur for their help.

(Portage version: 2.1.10.11/cvs/Linux x86_64)

3 files changed, 195 insertions, 1 deletions

diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index 0ac4da28b77d..1ce3aa29f217 100644
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -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:
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
index 000000000000..71db10791749
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-2.4.7-python-detection.patch
@@ -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
index 000000000000..745a7641ad61
--- /dev/null
+++ b/app-office/gnucash/gnucash-2.4.7.ebuild
@@ -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
+}