fixes from bug 112897

Package-Manager: portage-2.1.2.2

diff --git a/dev-libs/g-wrap/ChangeLog b/dev-libs/g-wrap/ChangeLog
index 1b44f000b05d5acfb61ce0928babcfd750add049..6f10510126eb2b106343af0f71b3d45d102488a3 100644 (file)
--- a/dev-libs/g-wrap/ChangeLog
+++ b/dev-libs/g-wrap/ChangeLog
@@ -1,16 +1,25 @@
 # 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.43 2007/03/04 10:09:43 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/ChangeLog,v 1.44 2007/03/11 13:01:57 hkbst Exp $
+
+  11 Mar 2007; Marijn Schouten <hkBst@gentoo.org> g-wrap-1.9.6-r3.ebuild,
+  g-wrap-1.9.7-r3.ebuild:
+  some small fixes from bug 112897
 
   03 Mar 2007; Marijn Schouten <hkBst@gentoo.org> g-wrap-1.9.6-r3.ebuild,
   g-wrap-1.9.7-r3.ebuild:
   only block libffi-4*
 
+*g-wrap-1.9.7-r3 (02 Mar 2007)
+*g-wrap-1.9.6-r3 (02 Mar 2007)
+
   02 Mar 2007; Marijn Schouten <hkBst@gentoo.org>
   +files/libffi_automagic.patch, -g-wrap-1.9.6-r2.ebuild,
   +g-wrap-1.9.6-r3.ebuild, -g-wrap-1.9.7-r2.ebuild, +g-wrap-1.9.7-r3.ebuild:
   always build internal libffi, fixes bug 163647
 
+*g-wrap-1.9.6-r2 (28 Feb 2007)
+
   28 Feb 2007; Marijn Schouten <hkBst@gentoo.org> g-wrap-1.9.6-r2.ebuild
   files/digest-g-wrap-1.9.6-r2 -g-wrap-1.9.6-r1.ebuild -files/digest-g-wrap-1.9.6-r1:
   fix srfi issues of bug 165763

diff --git a/dev-libs/g-wrap/Manifest b/dev-libs/g-wrap/Manifest
index 49377bd9b8cee0ecf2de30199775c13ddb629042..953ce8c045767c2efa31387d73be265b0751b3e5 100644 (file)
--- a/dev-libs/g-wrap/Manifest
+++ b/dev-libs/g-wrap/Manifest
@@ -29,18 +29,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-r3.ebuild 1302 RMD160 45f219215a48f06be1bef41958232dd3ba952a99 SHA1 7a0fa274890f8226de39ac92221bbe534e7f82e0 SHA256 6ed6723bad55da98d8b31c5212818d5860c2f27e22fbfb99a75cfdd0c4bad3f8
-MD5 92123b188bfd89a83fcbe084316244e8 g-wrap-1.9.6-r3.ebuild 1302
-RMD160 45f219215a48f06be1bef41958232dd3ba952a99 g-wrap-1.9.6-r3.ebuild 1302
-SHA256 6ed6723bad55da98d8b31c5212818d5860c2f27e22fbfb99a75cfdd0c4bad3f8 g-wrap-1.9.6-r3.ebuild 1302
-EBUILD g-wrap-1.9.7-r3.ebuild 1302 RMD160 0bd386efe721a6a146384aca326536bbfe466241 SHA1 1880b97c0dab8d8324a26b9a865c2b6d2b41d104 SHA256 865eb7cd4d2333020b64322344c6fb01afcbb59ebc62610f217d256a3955122d
-MD5 feceb920ed7c30c7569ebcc854e58616 g-wrap-1.9.7-r3.ebuild 1302
-RMD160 0bd386efe721a6a146384aca326536bbfe466241 g-wrap-1.9.7-r3.ebuild 1302
-SHA256 865eb7cd4d2333020b64322344c6fb01afcbb59ebc62610f217d256a3955122d g-wrap-1.9.7-r3.ebuild 1302
-MISC ChangeLog 6171 RMD160 8f000316dc4d8ecd09ae741fe46b9048e13108e3 SHA1 7a235b01ea10d95d937f2a00c16af42070cb1ffe SHA256 c6fe49798b7212ff5ae4e47bd6cf76ddf4eb557fea8c3163413dd285c3fbde71
-MD5 36b7c307cecc96ebb016acf69c754f7d ChangeLog 6171
-RMD160 8f000316dc4d8ecd09ae741fe46b9048e13108e3 ChangeLog 6171
-SHA256 c6fe49798b7212ff5ae4e47bd6cf76ddf4eb557fea8c3163413dd285c3fbde71 ChangeLog 6171
+EBUILD g-wrap-1.9.6-r3.ebuild 1330 RMD160 4142f8944da172be41c3cc53e3e4ca2aafd208c3 SHA1 2eeb5c2fa33ffa11290fb37bd648958f76192aae SHA256 c64dfdabe47cf3d0ae8b0a0f08e6c5d53217c04b8d3f5c713101e42c76b863e8
+MD5 262a5905e0a3b215da302b579f784d13 g-wrap-1.9.6-r3.ebuild 1330
+RMD160 4142f8944da172be41c3cc53e3e4ca2aafd208c3 g-wrap-1.9.6-r3.ebuild 1330
+SHA256 c64dfdabe47cf3d0ae8b0a0f08e6c5d53217c04b8d3f5c713101e42c76b863e8 g-wrap-1.9.6-r3.ebuild 1330
+EBUILD g-wrap-1.9.7-r3.ebuild 1330 RMD160 909735db78d330cd7ef2e4131ba790de82837862 SHA1 4488bdc720dee10a6167616ebde2eb04b0bd4c10 SHA256 bcbc905a68d5ba9eb57226d37d1f4380a119ec9bac69fcdc12b462b9f47f0212
+MD5 ccb9b741731c4a0e8667dbf46035ac84 g-wrap-1.9.7-r3.ebuild 1330
+RMD160 909735db78d330cd7ef2e4131ba790de82837862 g-wrap-1.9.7-r3.ebuild 1330
+SHA256 bcbc905a68d5ba9eb57226d37d1f4380a119ec9bac69fcdc12b462b9f47f0212 g-wrap-1.9.7-r3.ebuild 1330
+MISC ChangeLog 6402 RMD160 f944db86bd069c943286713bcedbc701f19f69ff SHA1 36f2cc0f634de6265306d2dbad04a232b38dde00 SHA256 8e616c9d196cd6d8833e5b5851f865fc4f3fc880751da9f3d745065ce98cc95c
+MD5 5f5c0b76ba1a6995fcbf258e14fde592 ChangeLog 6402
+RMD160 f944db86bd069c943286713bcedbc701f19f69ff ChangeLog 6402
+SHA256 8e616c9d196cd6d8833e5b5851f865fc4f3fc880751da9f3d745065ce98cc95c ChangeLog 6402
 MISC metadata.xml 468 RMD160 110e67df4ca1cc3d6204b0066f1f2503671fc742 SHA1 5627c00d4d4884e9d89a39eeac7e3a7cf51e6a44 SHA256 99779e068e75c9c4ceb9bc64b787f1c944ff1f3e45e659bee5eb04835498a936
 MD5 cb23790b246158fbaee5857f8ee9dea4 metadata.xml 468
 RMD160 110e67df4ca1cc3d6204b0066f1f2503671fc742 metadata.xml 468

diff --git a/dev-libs/g-wrap/g-wrap-1.9.6-r3.ebuild b/dev-libs/g-wrap/g-wrap-1.9.6-r3.ebuild
index d5665ef7585e5521adf0e73586695ca3067fe34c..109dcc7f487effd825a0c21d20131bbcd499b20d 100644 (file)
--- a/dev-libs/g-wrap/g-wrap-1.9.6-r3.ebuild
+++ b/dev-libs/g-wrap/g-wrap-1.9.6-r3.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-r3.ebuild,v 1.2 2007/03/03 12:12:01 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/g-wrap-1.9.6-r3.ebuild,v 1.3 2007/03/11 13:01:57 hkbst Exp $
 
 inherit eutils autotools
 
@@ -17,10 +17,13 @@ DEPEND="dev-scheme/guile =dev-libs/glib-2* !=dev-libs/libffi-4*"
 
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-       if has_version =guile-1.8*; then
+pkg_setup() {
+       if has_version =dev-scheme/guile-1.8*; then
                built_with_use dev-scheme/guile deprecated || die "guile must be built with deprecated use flag"
        fi
+}
+
+src_unpack() {
        unpack ${A}
        cd "${S}"
        epatch ${FILESDIR}/${P}_glib_automagic.patch

diff --git a/dev-libs/g-wrap/g-wrap-1.9.7-r3.ebuild b/dev-libs/g-wrap/g-wrap-1.9.7-r3.ebuild
index 84090896c339f6b7cbfb5f1d6db0a420964d61f7..c2b9f86868c83d9061ba56d370d6d61280f224b3 100644 (file)
--- a/dev-libs/g-wrap/g-wrap-1.9.7-r3.ebuild
+++ b/dev-libs/g-wrap/g-wrap-1.9.7-r3.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-r3.ebuild,v 1.2 2007/03/03 12:12:01 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/g-wrap-1.9.7-r3.ebuild,v 1.3 2007/03/11 13:01:57 hkbst Exp $
 
 inherit eutils autotools
 
@@ -17,10 +17,13 @@ DEPEND="dev-scheme/guile =dev-libs/glib-2* !=dev-libs/libffi-4*"
 
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-       if has_version =guile-1.8*; then
+pkg_setup() {
+       if has_version =dev-scheme/guile-1.8*; then
                built_with_use dev-scheme/guile deprecated || die "guile must be built with deprecated use flag"
        fi
+}
+
+src_unpack() {
        unpack ${A}
        cd "${S}"
        epatch ${FILESDIR}/${P}_glib_automagic.patch