diff options
| author |   Brad House <brad_mssw@gentoo.org> | 2003-10-17 04:13:42 +0000 |
|---|---|---|
| committer | Brad House <brad_mssw@gentoo.org> | 2003-10-17 04:13:42 +0000 |
| commit | ebff4c0ee7e2d928cdbd0ae531e54b98eed330ef (patch) | |
| tree | ec122bd3cfe719fc1c414f1d812b26ba11c77361 /gnome-base | |
| parent | *** empty log message *** (diff) | |
| download | gentoo-2-ebff4c0ee7e2d928cdbd0ae531e54b98eed330ef.tar.gz gentoo-2-ebff4c0ee7e2d928cdbd0ae531e54b98eed330ef.tar.bz2 gentoo-2-ebff4c0ee7e2d928cdbd0ae531e54b98eed330ef.zip | |
fix compilation on amd64
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/gnome-libs/ChangeLog | 9 | ||||
| -rw-r--r-- | gnome-base/gnome-libs/Manifest | 4 | ||||
| -rw-r--r-- | gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild | 7 |
3 files changed, 12 insertions, 8 deletions
diff --git a/gnome-base/gnome-libs/ChangeLog b/gnome-base/gnome-libs/ChangeLog index 261f07a2aa34..cae438feb934 100644 --- a/gnome-base/gnome-libs/ChangeLog +++ b/gnome-base/gnome-libs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-base/gnome-libs # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/ChangeLog,v 1.20 2003/07/19 23:22:43 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/ChangeLog,v 1.21 2003/10/17 04:13:39 brad_mssw Exp $ + + 17 Oct 2003; Brad House <brad_mssw@gentoo.org> gnome-libs-1.4.2.ebuild: + seems to require db1 on amd64. surprised it doesn't on other systems, or + perhaps it's installed by default on other systems and has just never been + noticed as db1 on amd64 was just unmasked. Also remove patch that removed + db-detecting as this messed things up on amd64, even though it was marked as + an amd64-only patch. 19 Jul 2003; Olivier Crete <tester@gentoo.org> gnome-libs-1.4.2.ebuild, files/no-libdb-check.diff: diff --git a/gnome-base/gnome-libs/Manifest b/gnome-base/gnome-libs/Manifest index f1e09006ff2d..bebc5c458471 100644 --- a/gnome-base/gnome-libs/Manifest +++ b/gnome-base/gnome-libs/Manifest @@ -1,8 +1,8 @@ -MD5 a03680ae9d9b0edca1b14c0e2e3ce301 ChangeLog 2542 +MD5 7c6cc1547d8e570ee54872a3a0623eae ChangeLog 2950 MD5 df8e5c34e6bd977712c8e5e14cd6b074 gnome-libs-1.4.1.6.ebuild 1934 MD5 a2480c897f3d43ca5449a57d6694ebe9 gnome-libs-1.4.1.7.ebuild 1579 -MD5 bf7abf0c8254c5fab245bdd9c3d1bb65 gnome-libs-1.4.2.ebuild 1960 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 +MD5 72ff4df1bd5baaa42fc4e6ecf5e97636 gnome-libs-1.4.2.ebuild 1826 MD5 3a9b07232c2e27a44a8b3b3a83a9d696 files/digest-gnome-libs-1.4.1.6 72 MD5 f699a38c77fa9c8d30de6e1c9d4ba7c0 files/digest-gnome-libs-1.4.1.7 72 MD5 e0991b18209dfd87a7d6f2ed771dc00b files/digest-gnome-libs-1.4.2 70 diff --git a/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild b/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild index c94c53753418..5f26ea786b21 100644 --- a/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild +++ b/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild,v 1.12 2003/09/06 23:51:37 msterret Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild,v 1.13 2003/10/17 04:13:39 brad_mssw Exp $ IUSE="doc nls kde" @@ -19,7 +19,7 @@ RDEPEND=">=media-libs/imlib-1.9.10 >=media-sound/esound-0.2.23 >=gnome-base/ORBit-0.5.12 =x11-libs/gtk+-1.2* - amd64? sys-libs/db : <sys-libs/db-2 + amd64? <=sys-libs/db-2 doc? ( app-text/docbook-sgml dev-util/gtk-doc )" @@ -31,9 +31,6 @@ SLOT="1" src_unpack() { unpack ${A} - # This patch isnt actually amd64 related at all and it a db4 issue - use amd64 && epatch ${FILESDIR}/no-libdb-check.diff - } src_compile() { |