| 1 |
eva 11/01/30 22:47:22 |
| 2 |
|
| 3 |
Modified: ChangeLog gnucash-2.4.0.ebuild |
| 4 |
Log: |
| 5 |
Fix multiple python slots support, fix test failures, disable python module test due to missing files, workaround guile configuration problem, bug #202205. Pin dependencies to appropriate slots. Add missing gnome-keyring dependencies, sort dependencies. Re-enable parallel build since it does not fail for me to get a bit more testing. Closes #346919. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.223 app-office/gnucash/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/gnucash/ChangeLog?rev=1.223&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/gnucash/ChangeLog?rev=1.223&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/gnucash/ChangeLog?r1=1.222&r2=1.223 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v |
| 19 |
retrieving revision 1.222 |
| 20 |
retrieving revision 1.223 |
| 21 |
diff -u -r1.222 -r1.223 |
| 22 |
--- ChangeLog 23 Dec 2010 11:41:00 -0000 1.222 |
| 23 |
+++ ChangeLog 30 Jan 2011 22:47:21 -0000 1.223 |
| 24 |
@@ -1,6 +1,15 @@ |
| 25 |
# ChangeLog for app-office/gnucash |
| 26 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.222 2010/12/23 11:41:00 tove Exp $ |
| 28 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.223 2011/01/30 22:47:21 eva Exp $ |
| 30 |
+ |
| 31 |
+ 30 Jan 2011; Gilles Dartiguelongue <eva@g.o> gnucash-2.4.0.ebuild, |
| 32 |
+ +files/gnucash-2.4.0-disable-dynload-test.patch, |
| 33 |
+ +files/gnucash-2.4.0-fix-tests-linking.patch: |
| 34 |
+ Fix multiple python slots support, fix test failures, disable python module |
| 35 |
+ test due to missing files, workaround guile configuration problem, bug |
| 36 |
+ #202205. Pin dependencies to appropriate slots. Add missing gnome-keyring |
| 37 |
+ dependencies, sort dependencies. Re-enable parallel build since it does not |
| 38 |
+ fail for me to get a bit more testing. Closes #346919. |
| 39 |
|
| 40 |
23 Dec 2010; Torsten Veller <tove@g.o> -gnucash-2.3.15.ebuild: |
| 41 |
Cleanup |
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.2 app-office/gnucash/gnucash-2.4.0.ebuild |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/gnucash/gnucash-2.4.0.ebuild?rev=1.2&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/gnucash/gnucash-2.4.0.ebuild?rev=1.2&content-type=text/plain |
| 49 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/gnucash/gnucash-2.4.0.ebuild?r1=1.1&r2=1.2 |
| 50 |
|
| 51 |
Index: gnucash-2.4.0.ebuild |
| 52 |
=================================================================== |
| 53 |
RCS file: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.4.0.ebuild,v |
| 54 |
retrieving revision 1.1 |
| 55 |
retrieving revision 1.2 |
| 56 |
diff -u -r1.1 -r1.2 |
| 57 |
--- gnucash-2.4.0.ebuild 23 Dec 2010 11:39:50 -0000 1.1 |
| 58 |
+++ gnucash-2.4.0.ebuild 30 Jan 2011 22:47:21 -0000 1.2 |
| 59 |
@@ -1,13 +1,11 @@ |
| 60 |
-# Copyright 1999-2010 Gentoo Foundation |
| 61 |
+# Copyright 1999-2011 Gentoo Foundation |
| 62 |
# Distributed under the terms of the GNU General Public License v2 |
| 63 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.4.0.ebuild,v 1.1 2010/12/23 11:39:50 tove Exp $ |
| 64 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.4.0.ebuild,v 1.2 2011/01/30 22:47:21 eva Exp $ |
| 65 |
|
| 66 |
-EAPI=3 |
| 67 |
+EAPI="3" |
| 68 |
+PYTHON_DEPEND="python? 2:2.4" |
| 69 |
|
| 70 |
-#PYTHON_DEPEND="python? 2:2.4" |
| 71 |
- |
| 72 |
-inherit eutils gnome2 |
| 73 |
-inherit python |
| 74 |
+inherit autotools eutils gnome2 python |
| 75 |
|
| 76 |
DOC_VER="2.2.0" |
| 77 |
|
| 78 |
@@ -22,18 +20,21 @@ |
| 79 |
|
| 80 |
# FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.in) |
| 81 |
|
| 82 |
-RDEPEND=">=dev-libs/glib-2.6.3 |
| 83 |
+RDEPEND=">=dev-libs/glib-2.13:2 |
| 84 |
+ >=dev-libs/popt-1.5 |
| 85 |
+ >=dev-libs/libxml2-2.5.10 |
| 86 |
>=dev-scheme/guile-1.8.3[deprecated,regex] |
| 87 |
dev-scheme/guile-www |
| 88 |
>=dev-scheme/slib-3.1.4 |
| 89 |
- >=sys-libs/zlib-1.1.4 |
| 90 |
- >=dev-libs/popt-1.5 |
| 91 |
- >=x11-libs/gtk+-2.10 |
| 92 |
+ >=gnome-base/gconf-2 |
| 93 |
>=gnome-base/libgnomeui-2.4 |
| 94 |
>=gnome-base/libglade-2.4 |
| 95 |
- >=dev-libs/libxml2-2.5.10 |
| 96 |
- >=gnome-base/gconf-2 |
| 97 |
- >=x11-libs/goffice-0.6[gnome] |
| 98 |
+ || ( <gnome-base/gnome-keyring-2.29 gnome-base/libgnome-keyring ) |
| 99 |
+ media-libs/libart_lgpl |
| 100 |
+ >=sys-libs/zlib-1.1.4 |
| 101 |
+ >=x11-libs/gtk+-2.14:2 |
| 102 |
+ x11-libs/goffice:0.8[gnome] |
| 103 |
+ x11-libs/pango |
| 104 |
ofx? ( >=dev-libs/libofx-0.9.1 ) |
| 105 |
hbci? ( |
| 106 |
|| ( |
| 107 |
@@ -46,25 +47,26 @@ |
| 108 |
>=dev-perl/Finance-Quote-1.11 |
| 109 |
dev-perl/HTML-TableExtract ) |
| 110 |
webkit? ( net-libs/webkit-gtk ) |
| 111 |
- !webkit? ( >=gnome-extra/gtkhtml-3.14 ) |
| 112 |
+ !webkit? ( >=gnome-extra/gtkhtml-3.16:3.14 ) |
| 113 |
sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite3] ) |
| 114 |
postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) |
| 115 |
mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) |
| 116 |
- media-libs/libart_lgpl |
| 117 |
- x11-libs/pango" |
| 118 |
- |
| 119 |
+" |
| 120 |
DEPEND="${RDEPEND} |
| 121 |
+ >=app-text/scrollkeeper-0.3 |
| 122 |
dev-util/pkgconfig |
| 123 |
dev-util/intltool |
| 124 |
+ gnome-base/gnome-common |
| 125 |
sys-devel/libtool |
| 126 |
- >=app-text/scrollkeeper-0.3" |
| 127 |
+" |
| 128 |
|
| 129 |
PDEPEND="doc? ( >=app-doc/gnucash-docs-${DOC_VER} )" |
| 130 |
#ELTCONF="--patch-only" |
| 131 |
DOCS="doc/README.OFX doc/README.HBCI" |
| 132 |
|
| 133 |
# FIXME: no the best thing to do but it'd be even better to fix autofoo |
| 134 |
-MAKEOPTS="${MAKEOPTS} -j1" |
| 135 |
+# XXX: does not break here |
| 136 |
+#MAKEOPTS="${MAKEOPTS} -j1" |
| 137 |
|
| 138 |
pkg_setup() { |
| 139 |
if use webkit ; then |
| 140 |
@@ -89,13 +91,40 @@ |
| 141 |
|
| 142 |
if use python ; then |
| 143 |
python_set_active_version 2 |
| 144 |
- python_pkg_setup |
| 145 |
fi |
| 146 |
} |
| 147 |
|
| 148 |
+src_configure() { |
| 149 |
+ # guile wrongly exports LDFLAGS as LIBS which breaks modules |
| 150 |
+ # Filter until a better ebuild is available, bug #202205 |
| 151 |
+ local GUILE_LIBS="" |
| 152 |
+ local lib |
| 153 |
+ for lib in $(guile-config link); do |
| 154 |
+ if [ "${lib#-Wl}" = "$lib" ]; then |
| 155 |
+ GUILE_LIBS="$GUILE_LIBS $lib" |
| 156 |
+ fi |
| 157 |
+ done |
| 158 |
+ |
| 159 |
+ econf GUILE_LIBS="${GUILE_LIBS}" ${G2CONF} |
| 160 |
+} |
| 161 |
+ |
| 162 |
src_prepare() { |
| 163 |
gnome2_src_prepare |
| 164 |
: > "${S}"/py-compile |
| 165 |
+ |
| 166 |
+ # Disable test broken by libtool magic ??? |
| 167 |
+ epatch "${FILESDIR}/${PN}-2.4.0-disable-dynload-test.patch" |
| 168 |
+ |
| 169 |
+ # Fix test linking issues |
| 170 |
+ epatch "${FILESDIR}/${PN}-2.4.0-fix-tests-linking.patch" |
| 171 |
+ |
| 172 |
+ # Disable python binding tests because of missing file |
| 173 |
+ sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \ |
| 174 |
+ -i src/optional/python-bindings/Makefile.{am,in} \ |
| 175 |
+ || die "python tests sed failed" |
| 176 |
+ |
| 177 |
+ intltoolize --force --copy --automake || die "intltoolize failed" |
| 178 |
+ eautoreconf |
| 179 |
} |
| 180 |
|
| 181 |
src_test() { |
Archives