Bug 122312, thanks yuval. Submitted upstream for next release

Package-Manager: portage-2.1_pre3-r1

4 files changed, 43 insertions, 25 deletions

diff --git a/dev-perl/glib-perl/ChangeLog b/dev-perl/glib-perl/ChangeLog
index ac151eca3cfc..d269c5ada8f2 100644
--- a/dev-perl/glib-perl/ChangeLog
+++ b/dev-perl/glib-perl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-perl/glib-perl
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/glib-perl/ChangeLog,v 1.43 2006/02/06 20:46:05 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/glib-perl/ChangeLog,v 1.44 2006/02/15 23:34:07 mcummings Exp $
+
+  15 Feb 2006; Michael Cummings <mcummings@gentoo.org> +files/gtypes.patch,
+  glib-perl-1.102.ebuild:
+  Bug 122312, thanks yuval. Submitted upstream for next release
 
   06 Feb 2006; Simon Stelling <blubb@gentoo.org> glib-perl-1.101.ebuild:
   stable on amd64
diff --git a/dev-perl/glib-perl/Manifest b/dev-perl/glib-perl/Manifest
index 3a62d67af9a0..d505c208317b 100644
--- a/dev-perl/glib-perl/Manifest
+++ b/dev-perl/glib-perl/Manifest
@@ -1,30 +1,21 @@
-MD5 1a017298a4f94e656b0bd412d19da875 ChangeLog 5516
-RMD160 8f291efc11d345c154d1e9bca4ded4671f18e1c7 ChangeLog 5516
-SHA256 f95678a4d0598e8178bed5fa3b65358531cb51048adcca2ab4394fdc0dd9935f ChangeLog 5516
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f348052c3b0c4c43f1ebe89dfce12194 ChangeLog 5687
 MD5 f0985e07520ccd93372582a61d920e5c files/digest-glib-perl-1.062 62
-RMD160 9aeda7364ac5d3bd1c98084ac09c5fe2716abb4e files/digest-glib-perl-1.062 62
-SHA256 9ccf0cc47d89a1b1846942e27b3c2d706628ade70fa852ad28fec104aa17b44d files/digest-glib-perl-1.062 62
 MD5 2a320dc6f223bfb71122994c982133be files/digest-glib-perl-1.081 62
-RMD160 e22c406d17a4c520ec5400a61cf6fd786748cfc9 files/digest-glib-perl-1.081 62
-SHA256 14d2b128c5501746401225649ee475bb03d13d5037b1fbe89e3269ed5656a5c7 files/digest-glib-perl-1.081 62
 MD5 4d74c754b3541dbd44a59805eeb904bd files/digest-glib-perl-1.101 62
-RMD160 1915cac282c42e6b6a1c6b1dc3fd762d4269541e files/digest-glib-perl-1.101 62
-SHA256 27cebe2af1ff38b41b6b6a804c7823255ee597e6f417f9b2ffb4b15d3ec6d2e0 files/digest-glib-perl-1.101 62
 MD5 31de1629df87f2be35f56882daaf266d files/digest-glib-perl-1.102 62
-RMD160 921653194f876144140c744a09b21f397df5b11e files/digest-glib-perl-1.102 62
-SHA256 c6e5eb4cba9aadea4420f45a15647c5651849478b3e8641949007f6dbcc59ab6 files/digest-glib-perl-1.102 62
+MD5 9d21d09a81a7145dd384f540639a7382 files/gtypes.patch 385
 MD5 9255c8a3f432f2cd0ad1e1a045079079 glib-perl-1.062.ebuild 754
-RMD160 90306233efde7b49d5355f71da4fa96e50f1f892 glib-perl-1.062.ebuild 754
-SHA256 175d5e878de9401afba72d1093734a0b8a69ae2149b9faf590395479e6bc3125 glib-perl-1.062.ebuild 754
 MD5 2e8a89384245ef851a789ecbdcf41a5f glib-perl-1.081.ebuild 765
-RMD160 e07262e00868901aa8d71804efc9c30af13c88cf glib-perl-1.081.ebuild 765
-SHA256 b8a9c5e058e06fde6dd61f55dd41b7a8a91c25248330bf0e48db6924f3844016 glib-perl-1.081.ebuild 765
 MD5 b97f83c4f22d6e820da8c2a641d3511a glib-perl-1.101.ebuild 770
-RMD160 8a92a8db33fb1b18141b1d1b7aa4905587803ff5 glib-perl-1.101.ebuild 770
-SHA256 347b544c5d083c91f827f8cd9e143a0dd94389bd7602eb75aa16378490c9b068 glib-perl-1.101.ebuild 770
-MD5 f4d8d312308d941da432aaa928a9dd5d glib-perl-1.102.ebuild 782
-RMD160 a7b4f497c0cbd2d93674ef3f1ba441934a8eab7b glib-perl-1.102.ebuild 782
-SHA256 ce2b7f2309d131a908e1ae8de33128b07263fc02c9955c1dcb808b53bec2f13a glib-perl-1.102.ebuild 782
+MD5 360fca6d1ddb32e62a215f3b93619d9f glib-perl-1.102.ebuild 1062
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
-SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca metadata.xml 305
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFD87pgtG5z4I8BtQoRAruYAKCR4W409NtNzksQSqRur14YaREFJgCeJ/2r
+CTCFlcd+lFvT9o6Ds89RzBg=
+=LkxH
+-----END PGP SIGNATURE-----
diff --git a/dev-perl/glib-perl/files/gtypes.patch b/dev-perl/glib-perl/files/gtypes.patch
new file mode 100644
index 000000000000..6a7fdf8981f2
--- /dev/null
+++ b/dev-perl/glib-perl/files/gtypes.patch
@@ -0,0 +1,11 @@
+--- GType.xs.old	2006-02-14 19:37:23.410495296 +0200
++++ GType.xs	2006-02-14 19:37:31.381283552 +0200
+@@ -1361,7 +1361,7 @@
+ 		croak ("Param spec type %s is not registered with GPerl",
+ 		       g_type_name (G_PARAM_SPEC_TYPE (pspec)));
+ 	stash = gv_stashpv (package, FALSE);
+-	assert (stash)
++	assert (stash);
+ 	method = gv_fetchmethod (stash, "get_default_value");
+ 
+ 	if (method) {
diff --git a/dev-perl/glib-perl/glib-perl-1.102.ebuild b/dev-perl/glib-perl/glib-perl-1.102.ebuild
index 8bbe2d1d591c..b06e12075501 100644
--- a/dev-perl/glib-perl/glib-perl-1.102.ebuild
+++ b/dev-perl/glib-perl/glib-perl-1.102.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/glib-perl/glib-perl-1.102.ebuild,v 1.1 2006/01/13 14:21:37 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/glib-perl/glib-perl-1.102.ebuild,v 1.2 2006/02/15 23:34:07 mcummings Exp $
 
-inherit perl-module
+inherit perl-module eutils
 
 MY_P=Glib-${PV}
 S=${WORKDIR}/${MY_P}
@@ -25,3 +25,15 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=dev-perl/extutils-depends-0.205
 	>=dev-perl/extutils-pkgconfig-1.07"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# The assert macro has changed in perl 5.8.8 from:
+	# if (...) { ... }
+	# to:
+	# (...) ? ((void) 0) : (...)
+	# The missing semicolon after calling assert caused compilation problems with perl 5.8.8
+	epatch ${FILESDIR}/gtypes.patch
+}