Version bump, drop old.

(Portage version: 2.1.11.17/cvs/Linux x86_64)

5 files changed, 177 insertions, 113 deletions

diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index fbe11e38f505..c6b6e11fe5cc 100644
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/gnucash
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.260 2012/05/24 13:31:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.261 2012/09/15 09:46:33 pacho Exp $
+
+*gnucash-2.4.11 (15 Sep 2012)
+
+  15 Sep 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/gnucash-2.4.11-potfiles-skip.patch, +gnucash-2.4.11.ebuild,
+  -files/gnucash-2.4.7-python-detection.patch,
+  -files/gnucash-2.4.8-python-detection.patch, -gnucash-2.4.8.ebuild:
+  Version bump, drop old.
 
   24 May 2012; Samuli Suominen <ssuominen@gentoo.org> gnucash-2.4.10.ebuild:
   ppc stable wrt #410611
diff --git a/app-office/gnucash/files/gnucash-2.4.11-potfiles-skip.patch b/app-office/gnucash/files/gnucash-2.4.11-potfiles-skip.patch
new file mode 100644
index 000000000000..6fef3a1dcd38
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-2.4.11-potfiles-skip.patch
@@ -0,0 +1,147 @@
+Index: gnucash/branches/2.4/po/POTFILES.skip

+===================================================================

+--- gnucash/branches/2.4/po/POTFILES.skip	(revision 18623)

++++ gnucash/branches/2.4/po/POTFILES.skip	(revision 22300)

+@@ -19,2 +19,142 @@

+ src/libqof/qof/qofquery-serialize.c

+ src/libqof/qof/qofsql.c

++

++# The scheme files are handled by intl-scm/guile-strings.c because

++# intltool wouldn't scan scheme files. They're here now because

++# intltool 0.50 *does* scan them, and it creates an error during make

++# check. Once the whole world has upgraded to intltool 0.50, intl-scm

++# can be deleted and these files added to POTFILES.in.

++

++src/app-utils/date-utilities.scm

++src/app-utils/prefs.scm

++src/business/business-utils/business-prefs.scm

++src/business/business-utils/business-utils.scm

++src/business/business-utils/gnucash/business-utils.scm

++src/import-export/qif-import/qif-dialog-utils.scm

++src/import-export/qif-import/qif-file.scm

++src/import-export/qif-import/qif-import/qif-dialog-utils.scm

++src/import-export/qif-import/qif-import/qif-file.scm

++src/import-export/qif-import/qif-import/qif-merge-groups.scm

++src/import-export/qif-import/qif-import/qif-parse.scm

++src/import-export/qif-import/qif-import/qif-to-gnc.scm

++src/import-export/qif-import/qif-merge-groups.scm

++src/import-export/qif-import/qif-parse.scm

++src/import-export/qif-import/qif-to-gnc.scm

++src/report/business-reports/aging.scm

++src/report/business-reports/balsheet-eg.eguile.scm

++src/report/business-reports/balsheet-eg.scm

++src/report/business-reports/business-reports.scm

++src/report/business-reports/customer-summary.scm

++src/report/business-reports/easy-invoice.scm

++src/report/business-reports/fancy-invoice.scm

++src/report/business-reports/gnucash/report/aging.scm

++src/report/business-reports/gnucash/report/balsheet-eg.eguile.scm

++src/report/business-reports/gnucash/report/balsheet-eg.scm

++src/report/business-reports/gnucash/report/business-reports.scm

++src/report/business-reports/gnucash/report/customer-summary.scm

++src/report/business-reports/gnucash/report/easy-invoice.scm

++src/report/business-reports/gnucash/report/fancy-invoice.scm

++src/report/business-reports/gnucash/report/invoice.scm

++src/report/business-reports/gnucash/report/job-report.scm

++src/report/business-reports/gnucash/report/owner-report.scm

++src/report/business-reports/gnucash/report/payables.scm

++src/report/business-reports/gnucash/report/receivables.scm

++src/report/business-reports/gnucash/report/taxinvoice.eguile.scm

++src/report/business-reports/gnucash/report/taxinvoice.scm

++src/report/business-reports/invoice.scm

++src/report/business-reports/job-report.scm

++src/report/business-reports/owner-report.scm

++src/report/business-reports/payables.scm

++src/report/business-reports/receivables.scm

++src/report/business-reports/taxinvoice.eguile.scm

++src/report/business-reports/taxinvoice.scm

++src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm

++src/report/locale-specific/us/gnucash/report/taxtxf.scm

++src/report/locale-specific/us/taxtxf-de_DE.scm

++src/report/locale-specific/us/taxtxf.scm

++src/report/report-gnome/gnucash/report/report-gnome.scm

++src/report/report-gnome/report-gnome.scm

++src/report/report-system/eguile-gnc.scm

++src/report/report-system/gnucash/report/eguile-gnc.scm

++src/report/report-system/html-acct-table.scm

++src/report/report-system/html-fonts.scm

++src/report/report-system/html-style-sheet.scm

++src/report/report-system/html-utilities.scm

++src/report/report-system/options-utilities.scm

++src/report/report-system/report-utilities.scm

++src/report/report-system/report.scm

++src/report/standard-reports/account-piecharts.scm

++src/report/standard-reports/account-summary.scm

++src/report/standard-reports/advanced-portfolio.scm

++src/report/standard-reports/average-balance.scm

++src/report/standard-reports/balance-sheet.scm

++src/report/standard-reports/budget-balance-sheet.scm

++src/report/standard-reports/budget-barchart.scm

++src/report/standard-reports/budget-flow.scm

++src/report/standard-reports/budget-income-statement.scm

++src/report/standard-reports/budget.scm

++src/report/standard-reports/cash-flow.scm

++src/report/standard-reports/category-barchart.scm

++src/report/standard-reports/daily-reports.scm

++src/report/standard-reports/equity-statement.scm

++src/report/standard-reports/general-journal.scm

++src/report/standard-reports/general-ledger.scm

++src/report/standard-reports/gnucash/report/standard-reports/account-piecharts.scm

++src/report/standard-reports/gnucash/report/standard-reports/account-summary.scm

++src/report/standard-reports/gnucash/report/standard-reports/advanced-portfolio.scm

++src/report/standard-reports/gnucash/report/standard-reports/average-balance.scm

++src/report/standard-reports/gnucash/report/standard-reports/balance-sheet.scm

++src/report/standard-reports/gnucash/report/standard-reports/budget-balance-sheet.scm

++src/report/standard-reports/gnucash/report/standard-reports/budget-barchart.scm

++src/report/standard-reports/gnucash/report/standard-reports/budget-flow.scm

++src/report/standard-reports/gnucash/report/standard-reports/budget-income-statement.scm

++src/report/standard-reports/gnucash/report/standard-reports/budget.scm

++src/report/standard-reports/gnucash/report/standard-reports/cash-flow.scm

++src/report/standard-reports/gnucash/report/standard-reports/category-barchart.scm

++src/report/standard-reports/gnucash/report/standard-reports/daily-reports.scm

++src/report/standard-reports/gnucash/report/standard-reports/equity-statement.scm

++src/report/standard-reports/gnucash/report/standard-reports/general-journal.scm

++src/report/standard-reports/gnucash/report/standard-reports/general-ledger.scm

++src/report/standard-reports/gnucash/report/standard-reports/income-statement.scm

++src/report/standard-reports/gnucash/report/standard-reports/net-barchart.scm

++src/report/standard-reports/gnucash/report/standard-reports/net-linechart.scm

++src/report/standard-reports/gnucash/report/standard-reports/portfolio.scm

++src/report/standard-reports/gnucash/report/standard-reports/price-scatter.scm

++src/report/standard-reports/gnucash/report/standard-reports/register.scm

++src/report/standard-reports/gnucash/report/standard-reports/sx-summary.scm

++src/report/standard-reports/gnucash/report/standard-reports/transaction.scm

++src/report/standard-reports/gnucash/report/standard-reports/trial-balance.scm

++src/report/standard-reports/income-statement.scm

++src/report/standard-reports/net-barchart.scm

++src/report/standard-reports/net-linechart.scm

++src/report/standard-reports/portfolio.scm

++src/report/standard-reports/price-scatter.scm

++src/report/standard-reports/register.scm

++src/report/standard-reports/sx-summary.scm

++src/report/standard-reports/transaction.scm

++src/report/standard-reports/trial-balance.scm

++src/report/stylesheets/gnucash/report/stylesheet-easy.scm

++src/report/stylesheets/gnucash/report/stylesheet-fancy.scm

++src/report/stylesheets/gnucash/report/stylesheet-footer.scm

++src/report/stylesheets/gnucash/report/stylesheet-plain.scm

++src/report/stylesheets/stylesheet-easy.scm

++src/report/stylesheets/stylesheet-fancy.scm

++src/report/stylesheets/stylesheet-footer.scm

++src/report/stylesheets/stylesheet-plain.scm

++src/report/utility-reports/gnucash/report/hello-world.scm

++src/report/utility-reports/gnucash/report/view-column.scm

++src/report/utility-reports/gnucash/report/welcome-to-gnucash.scm

++src/report/utility-reports/hello-world.scm

++src/report/utility-reports/view-column.scm

++src/report/utility-reports/welcome-to-gnucash.scm

++src/scm/build-config.scm

++src/scm/build-config.scm.in

++src/scm/command-line.scm

++src/scm/gnucash/price-quotes.scm

++src/scm/main-window.scm

++src/scm/price-quotes.scm

++src/tax/us/de_DE.scm

++src/tax/us/gnucash/tax/de_DE.scm

++src/tax/us/txf-de_DE.scm

++src/tax/us/txf.scm

++

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
deleted file mode 100644
index 71db10791749..000000000000
--- a/app-office/gnucash/files/gnucash-2.4.7-python-detection.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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/files/gnucash-2.4.8-python-detection.patch b/app-office/gnucash/files/gnucash-2.4.8-python-detection.patch
deleted file mode 100644
index fa691d385a85..000000000000
--- a/app-office/gnucash/files/gnucash-2.4.8-python-detection.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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.11.ebuild
index e5180f058bc9..62b8cf7e82fe 100644
--- a/app-office/gnucash/gnucash-2.4.8.ebuild
+++ b/app-office/gnucash/gnucash-2.4.11.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 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.7 2012/05/03 20:00:38 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.4.11.ebuild,v 1.1 2012/09/15 09:46:33 pacho Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
 GCONF_DEBUG="no"
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit gnome2 python eutils autotools
+inherit gnome2 python eutils
 
 DOC_VER="2.2.0"
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+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)
@@ -38,7 +38,7 @@ RDEPEND=">=dev-libs/glib-2.13:2
 	x11-libs/pango
 	cxx? ( dev-cpp/gtkmm:2.4 )
 	ofx? ( >=dev-libs/libofx-0.9.1 )
-	hbci? ( >=net-libs/aqbanking-5[gtk]
+	hbci? ( >=net-libs/aqbanking-5[gtk,ofx?]
 		sys-libs/gwenhywfar[gtk]
 		chipcard? ( sys-libs/libchipcard )
 	)
@@ -92,6 +92,23 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=680402
+	epatch "${FILESDIR}/${P}-potfiles-skip.patch"
+
+	if use python; then
+		python_convert_shebangs -r 2 .
+		python_clean_py-compile_files
+	fi
+
+	# 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"
+
+	gnome2_src_prepare
+}
+
 src_configure() {
 	# guile wrongly exports LDFLAGS as LIBS which breaks modules
 	# Filter until a better ebuild is available, bug #202205
@@ -106,24 +123,6 @@ src_configure() {
 	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 \