From adf9d85540a627bf0fa9434d1ff382c250496e2b Mon Sep 17 00:00:00 2001 From: Marijn Schouten Date: Wed, 24 Jan 2007 17:15:21 +0000 Subject: [PATCH] force glib on Package-Manager: portage-2.1.2-r2 --- dev-libs/g-wrap/ChangeLog | 9 ++++- dev-libs/g-wrap/Manifest | 36 +++++++++---------- ...st-g-wrap-1.9.6 => digest-g-wrap-1.9.6-r1} | 0 ...g-wrap-1.9.7-r1 => digest-g-wrap-1.9.7-r2} | 0 ...ap-1.9.6.ebuild => g-wrap-1.9.6-r1.ebuild} | 8 ++--- ...1.9.7-r1.ebuild => g-wrap-1.9.7-r2.ebuild} | 8 ++--- 6 files changed, 34 insertions(+), 27 deletions(-) rename dev-libs/g-wrap/files/{digest-g-wrap-1.9.6 => digest-g-wrap-1.9.6-r1} (100%) rename dev-libs/g-wrap/files/{digest-g-wrap-1.9.7-r1 => digest-g-wrap-1.9.7-r2} (100%) rename dev-libs/g-wrap/{g-wrap-1.9.6.ebuild => g-wrap-1.9.6-r1.ebuild} (82%) rename dev-libs/g-wrap/{g-wrap-1.9.7-r1.ebuild => g-wrap-1.9.7-r2.ebuild} (88%) diff --git a/dev-libs/g-wrap/ChangeLog b/dev-libs/g-wrap/ChangeLog index e571194d3cc7..f67994117fce 100644 --- a/dev-libs/g-wrap/ChangeLog +++ b/dev-libs/g-wrap/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-libs/g-wrap # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/ChangeLog,v 1.33 2007/01/20 10:02:22 hkbst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/ChangeLog,v 1.34 2007/01/24 17:15:21 hkbst Exp $ + +*g-wrap-1.9.7-r2 (24 Jan 2007) +*g-wrap-1.9.6-r1 (24 Jan 2007) + + 24 Jan 2007; Marijn Schouten -g-wrap-1.9.6.ebuild, + +g-wrap-1.9.6-r1.ebuild, -g-wrap-1.9.7-r1.ebuild, +g-wrap-1.9.7-r2.ebuild: + force glib on 20 Jan 2007; Marijn Schouten files/g-wrap-1.9.6_glib_automagic.patch: diff --git a/dev-libs/g-wrap/Manifest b/dev-libs/g-wrap/Manifest index 8d49ebd7f299..e2f6c265c94a 100644 --- a/dev-libs/g-wrap/Manifest +++ b/dev-libs/g-wrap/Manifest @@ -25,18 +25,18 @@ EBUILD g-wrap-1.3.4-r1.ebuild 908 RMD160 42d9ba6a1da7a6c5937a70f5da9a9cfc269ca2c MD5 449f820c337d499d5838557ec14a7df2 g-wrap-1.3.4-r1.ebuild 908 RMD160 42d9ba6a1da7a6c5937a70f5da9a9cfc269ca2cd g-wrap-1.3.4-r1.ebuild 908 SHA256 5785d96923c990c6da1572e00e493a69882d06c28cf18e52e52478be2a8c3b0d g-wrap-1.3.4-r1.ebuild 908 -EBUILD g-wrap-1.9.6.ebuild 1012 RMD160 521c906eff9dc6176bd10c4d95214f24a5122189 SHA1 c4fdf531dbc4dc43159f799a6fb33ee90a75c8e8 SHA256 8635304ef1e62a4a8dfeaf39a8ae09b66e886474a219214b644eb6bec1b4131c -MD5 04b01b96fe9ecba73b567a1e64dc7dac g-wrap-1.9.6.ebuild 1012 -RMD160 521c906eff9dc6176bd10c4d95214f24a5122189 g-wrap-1.9.6.ebuild 1012 -SHA256 8635304ef1e62a4a8dfeaf39a8ae09b66e886474a219214b644eb6bec1b4131c g-wrap-1.9.6.ebuild 1012 -EBUILD g-wrap-1.9.7-r1.ebuild 1015 RMD160 57544a6eed753fadbe7f833af7674e7cbeb4c6b8 SHA1 495a34e356976f30e9123bf87eb251ba2f505ba4 SHA256 e26f1b042a72fb5d3785e6f2d4592c1800fde1835320f46f94baac84c716ff92 -MD5 bd2068647dc2924bc617ba4be1802fd5 g-wrap-1.9.7-r1.ebuild 1015 -RMD160 57544a6eed753fadbe7f833af7674e7cbeb4c6b8 g-wrap-1.9.7-r1.ebuild 1015 -SHA256 e26f1b042a72fb5d3785e6f2d4592c1800fde1835320f46f94baac84c716ff92 g-wrap-1.9.7-r1.ebuild 1015 -MISC ChangeLog 4740 RMD160 9f98db991a4a832ef2a0e42537d95f302e5c72ca SHA1 376b19510f217f01c9f55e27fb4046bcbfc3b6ec SHA256 0b738556a6c04a6bf3e00422f396f6ab3e18c97228544bda4a97351276e7d405 -MD5 470e61e9193ad5716197f5ccb9666dd4 ChangeLog 4740 -RMD160 9f98db991a4a832ef2a0e42537d95f302e5c72ca ChangeLog 4740 -SHA256 0b738556a6c04a6bf3e00422f396f6ab3e18c97228544bda4a97351276e7d405 ChangeLog 4740 +EBUILD g-wrap-1.9.6-r1.ebuild 996 RMD160 1e1cbd785abf22fb10c2d4f6823802c3003c438a SHA1 5425351faf72ae6a07159385afcd64a3e4e89596 SHA256 1cc7c050335a6e94806c37d87f5ec84f7211f6fe0f21cfd6389dcb67e8d766d2 +MD5 687c378a4f28c36314984e99732b7876 g-wrap-1.9.6-r1.ebuild 996 +RMD160 1e1cbd785abf22fb10c2d4f6823802c3003c438a g-wrap-1.9.6-r1.ebuild 996 +SHA256 1cc7c050335a6e94806c37d87f5ec84f7211f6fe0f21cfd6389dcb67e8d766d2 g-wrap-1.9.6-r1.ebuild 996 +EBUILD g-wrap-1.9.7-r2.ebuild 996 RMD160 7d8abba069fe834475806a52a939513d265f9085 SHA1 4f9b6f70c9cc1952336a63ac3db2f4e581e29ad2 SHA256 02f705dbb2ed02babf42d126528a30b4621026f0b51ab9e939dbba900df964f0 +MD5 7af3cddd9dfa3038202a5179e39247b1 g-wrap-1.9.7-r2.ebuild 996 +RMD160 7d8abba069fe834475806a52a939513d265f9085 g-wrap-1.9.7-r2.ebuild 996 +SHA256 02f705dbb2ed02babf42d126528a30b4621026f0b51ab9e939dbba900df964f0 g-wrap-1.9.7-r2.ebuild 996 +MISC ChangeLog 4969 RMD160 207e8f221cb5589a8c9b9ae6aed6b8d5fba33467 SHA1 c5d47088360b9bdd770f8c1016e5745c6f63aba1 SHA256 55e5c8e834f0d9b443551417997866f1beb34d69cc8ead0af875baa6f2a7c403 +MD5 3d93c13a4dc2b679a35147df203be453 ChangeLog 4969 +RMD160 207e8f221cb5589a8c9b9ae6aed6b8d5fba33467 ChangeLog 4969 +SHA256 55e5c8e834f0d9b443551417997866f1beb34d69cc8ead0af875baa6f2a7c403 ChangeLog 4969 MISC metadata.xml 468 RMD160 110e67df4ca1cc3d6204b0066f1f2503671fc742 SHA1 5627c00d4d4884e9d89a39eeac7e3a7cf51e6a44 SHA256 99779e068e75c9c4ceb9bc64b787f1c944ff1f3e45e659bee5eb04835498a936 MD5 cb23790b246158fbaee5857f8ee9dea4 metadata.xml 468 RMD160 110e67df4ca1cc3d6204b0066f1f2503671fc742 metadata.xml 468 @@ -44,9 +44,9 @@ SHA256 99779e068e75c9c4ceb9bc64b787f1c944ff1f3e45e659bee5eb04835498a936 metadata MD5 49072b71a0893483af97a027ec66c35c files/digest-g-wrap-1.3.4-r1 238 RMD160 421b33f9403adfcf66dd0cdde7b488595b6758e9 files/digest-g-wrap-1.3.4-r1 238 SHA256 be550d35c33e688f49c5da74b5439c7d89058af43b5b4a6421837e271b7cd522 files/digest-g-wrap-1.3.4-r1 238 -MD5 417daeca72cd92c7ed56c95b01dda85a files/digest-g-wrap-1.9.6 238 -RMD160 15950b5c477c0c423a4e794f92a384ec98652b3f files/digest-g-wrap-1.9.6 238 -SHA256 c300467065e5bfcbf694a59d0a1b0b6bd416760dc6705dd536cfbc1332247b85 files/digest-g-wrap-1.9.6 238 -MD5 37000183ad6896bcc388dbf244e12ad8 files/digest-g-wrap-1.9.7-r1 238 -RMD160 3c46d0df2f2ecd0dbd55902b941a38065aa85fc0 files/digest-g-wrap-1.9.7-r1 238 -SHA256 e31944bc17cdcbb6bc46e819672d07805eb30c18890050e3fc294eec62534cd6 files/digest-g-wrap-1.9.7-r1 238 +MD5 417daeca72cd92c7ed56c95b01dda85a files/digest-g-wrap-1.9.6-r1 238 +RMD160 15950b5c477c0c423a4e794f92a384ec98652b3f files/digest-g-wrap-1.9.6-r1 238 +SHA256 c300467065e5bfcbf694a59d0a1b0b6bd416760dc6705dd536cfbc1332247b85 files/digest-g-wrap-1.9.6-r1 238 +MD5 37000183ad6896bcc388dbf244e12ad8 files/digest-g-wrap-1.9.7-r2 238 +RMD160 3c46d0df2f2ecd0dbd55902b941a38065aa85fc0 files/digest-g-wrap-1.9.7-r2 238 +SHA256 e31944bc17cdcbb6bc46e819672d07805eb30c18890050e3fc294eec62534cd6 files/digest-g-wrap-1.9.7-r2 238 diff --git a/dev-libs/g-wrap/files/digest-g-wrap-1.9.6 b/dev-libs/g-wrap/files/digest-g-wrap-1.9.6-r1 similarity index 100% rename from dev-libs/g-wrap/files/digest-g-wrap-1.9.6 rename to dev-libs/g-wrap/files/digest-g-wrap-1.9.6-r1 diff --git a/dev-libs/g-wrap/files/digest-g-wrap-1.9.7-r1 b/dev-libs/g-wrap/files/digest-g-wrap-1.9.7-r2 similarity index 100% rename from dev-libs/g-wrap/files/digest-g-wrap-1.9.7-r1 rename to dev-libs/g-wrap/files/digest-g-wrap-1.9.7-r2 diff --git a/dev-libs/g-wrap/g-wrap-1.9.6.ebuild b/dev-libs/g-wrap/g-wrap-1.9.6-r1.ebuild similarity index 82% rename from dev-libs/g-wrap/g-wrap-1.9.6.ebuild rename to dev-libs/g-wrap/g-wrap-1.9.6-r1.ebuild index f9084ffd99b0..3a155b3c154e 100644 --- a/dev-libs/g-wrap/g-wrap-1.9.6.ebuild +++ b/dev-libs/g-wrap/g-wrap-1.9.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/g-wrap-1.9.6.ebuild,v 1.1 2007/01/19 15:37:25 hkbst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/g-wrap-1.9.6-r1.ebuild,v 1.1 2007/01/24 17:15:21 hkbst Exp $ inherit eutils autotools @@ -11,10 +11,10 @@ SRC_URI="http://download.savannah.gnu.org/releases/g-wrap/${P}.tar.gz" KEYWORDS="~amd64 ~x86" SLOT="0" LICENSE="GPL-2" -IUSE="glib" +IUSE="" DEPEND="=dev-scheme/guile-1.6* - glib? ( =dev-libs/glib-2* )" + =dev-libs/glib-2*" # seems not to work. g-wrap builds its own libffi-4.0.1 # dev-libs/libffi @@ -29,7 +29,7 @@ src_unpack() { #looks like parallel build and install fails occasionally src_compile() { - econf $(use_with glib) + econf --with-glib emake -j1 || die 'make failed' } diff --git a/dev-libs/g-wrap/g-wrap-1.9.7-r1.ebuild b/dev-libs/g-wrap/g-wrap-1.9.7-r2.ebuild similarity index 88% rename from dev-libs/g-wrap/g-wrap-1.9.7-r1.ebuild rename to dev-libs/g-wrap/g-wrap-1.9.7-r2.ebuild index fc2c9f05c4d0..82f4968186eb 100644 --- a/dev-libs/g-wrap/g-wrap-1.9.7-r1.ebuild +++ b/dev-libs/g-wrap/g-wrap-1.9.7-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/g-wrap-1.9.7-r1.ebuild,v 1.2 2007/01/19 15:37:25 hkbst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/g-wrap-1.9.7-r2.ebuild,v 1.1 2007/01/24 17:15:21 hkbst Exp $ inherit eutils autotools @@ -11,10 +11,10 @@ SRC_URI="http://download.savannah.gnu.org/releases/g-wrap/${P}.tar.gz" KEYWORDS="~amd64 ~x86" SLOT="0" LICENSE="GPL-2" -IUSE="glib" +IUSE="" DEPEND="=dev-scheme/guile-1.6* - glib? ( =dev-libs/glib-2* )" + =dev-libs/glib-2*" # seems not to work. g-wrap builds its own libffi-4.0.1 # dev-libs/libffi @@ -29,7 +29,7 @@ src_unpack() { #looks like parallel build and install fails occasionally src_compile() { - econf $(use_with glib) + econf --with-glib emake -j1 || die 'make failed' } -- 2.26.2