Revbump to add perl-5.14 support w/ Debian patch (thanks to turtle, bug 380153)

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 176 insertions, 5 deletions

diff --git a/media-libs/ming/ChangeLog b/media-libs/ming/ChangeLog
index 5afd254b43b7..e70427eb273b 100644
--- a/media-libs/ming/ChangeLog
+++ b/media-libs/ming/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/ming
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.81 2011/11/15 22:27:59 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.82 2011/11/16 00:56:48 xmw Exp $
+
+*ming-0.4.3-r2 (16 Nov 2011)
+
+  16 Nov 2011; Michael Weber <xmw@gentoo.org> +ming-0.4.3-r2.ebuild,
+  +files/ming-0.4.3-perl-5.14.patch:
+  Revbump to add perl-5.14 support w/ Debian patch (thanks to turtle, bug
+  380153)
 
   15 Nov 2011; Michael Weber <xmw@gentoo.org> ming-0.4.3-r1.ebuild:
   Adding virtual/yacc as DEPEND on stable ebuild (reported by David Owen, bug
diff --git a/media-libs/ming/Manifest b/media-libs/ming/Manifest
index 8525ec122480..8dda97a5321a 100644
--- a/media-libs/ming/Manifest
+++ b/media-libs/ming/Manifest
@@ -2,14 +2,16 @@
 Hash: SHA256
 
 AUX ming-0.4.3-libpng-1.5.patch 1344 RMD160 0b846c76dce0d921cf89947297be9a121a9ecc9a SHA1 3e08aa8dba069cac7654d95cc84b225a9a02384c SHA256 8c53e49a3fe3ce4ae0e9235985b6b17764677db30ade29b3b2b258fe71c3d098
+AUX ming-0.4.3-perl-5.14.patch 1469 RMD160 e707f893b68cd52758dbad14ca8aa9c24cf5f517 SHA1 0d465332bb1c08c273b38e268978c8d59ca59509 SHA256 c0ca274aef210dc5a5eb9114b0e4967fd0cb324d95a9597930847613fe4038e2
 DIST ming-0.4.3.tar.bz2 14098671 RMD160 38a495250c7f4ff3335ebd08df2984719a2f046b SHA1 e51a1c9de7efcd6b20f727a824cfbf323b6f5e6f SHA256 61480ef0bd911639ac0538bf59d4d5052a1380192d145e922720c33c40693bf0
 EBUILD ming-0.4.3-r1.ebuild 2437 RMD160 72c0c5f5974c0a9d6e39f5870a67384061d66fcf SHA1 c5f40818df9499bfce954889d0add6b1d921c6e3 SHA256 dc4abca69596e6f26a1616235a53f920571a4e29a8f27c7c30916f91d86955d0
-MISC ChangeLog 10898 RMD160 7f6a6ec1c48d951a37fa2313f0ec5843e046791b SHA1 ca66bb5559bd6f0b1f2081d2dc09489cb4c35d02 SHA256 51d367fe78c023eb94c7e25143cba9f54b4c9c4ce4644a3341b2583b21f0dd78
+EBUILD ming-0.4.3-r2.ebuild 2491 RMD160 1a0d2427a34472a218216e7116346a4eb3d8e4cc SHA1 566d0c5d13500fdc9a3ec251ad637b0ba2f5d362 SHA256 6f5f33927d329fbe85e78ddae79847a279d6e595e99c46bc505ec1571a383551
+MISC ChangeLog 11119 RMD160 5f5e0cad175b5361c31ba03424d58cf0227e8a45 SHA1 54db4b4390c1d8fb63edd600d25a58660dc6b0d6 SHA256 b654045716a1d9e8a852b08eca30f120b09a0bc34b788a510feba231506f3298
 MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk7C53UACgkQknrdDGLu8JAjXwEAhg7cH14Oldk1cjBQV+3NNUG0
-uNG+5jWRgDjGeh4Y/GsA/3MqYZBNJWSvCNhdKc+trvYYJ2N/RL8v8qjFJIXp0TEU
-=hhjl
+iF4EAREIAAYFAk7DClcACgkQknrdDGLu8JAiyQD/YuqaE8CopSuZ+sH2LOrDYOaq
+iEKP+c8GdEF6ipkjmBYBAIZmB75xEjATlMpDP9Pdx3eSgVmg56rrrKQNTVK2aHcL
+=ZaOo
 -----END PGP SIGNATURE-----
diff --git a/media-libs/ming/files/ming-0.4.3-perl-5.14.patch b/media-libs/ming/files/ming-0.4.3-perl-5.14.patch
new file mode 100644
index 000000000000..e34eb0f6f5e5
--- /dev/null
+++ b/media-libs/ming/files/ming-0.4.3-perl-5.14.patch
@@ -0,0 +1,43 @@
+From a0ea1cc47330a3ab316713d720892b6272401890 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Sun, 10 Jul 2011 21:46:09 +0300
+Subject: [PATCH] GvCV() isn't an lvalue since Perl 5.13.10
+
+GvCV() can't be assigned to anymore with recent perls, so use the new
+GvCV_set() macro when available or implement it the old way if it isn't.
+---
+ perl_ext/Exports.c  |    2 +-
+ perl_ext/perl_swf.h |    4 ++++
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/perl_ext/Exports.c b/perl_ext/Exports.c
+index 65f8912..5529728 100644
+--- a/perl_ext/Exports.c
++++ b/perl_ext/Exports.c
+@@ -190,7 +190,7 @@ void export_cv(SV *class, SV *caller, char *sub)
+             SvPVX(caller), sub, SvPVX(class), sub); 
+ #endif 
+     gv = gv_fetchpv(form("%s::%s",SvPVX( caller), sub), TRUE, SVt_PVCV); 
+-    GvCV(gv) = perl_get_cv(form("%s::%s", SvPVX(class), sub), TRUE); 
++    GvCV_set(gv, perl_get_cv(form("%s::%s", SvPVX(class), sub), TRUE)); 
+     GvIMPORTED_CV_on(gv); 
+     GvMULTI_on(gv);
+ } 
+diff --git a/perl_ext/perl_swf.h b/perl_ext/perl_swf.h
+index b960229..1a3656e 100644
+--- a/perl_ext/perl_swf.h
++++ b/perl_ext/perl_swf.h
+@@ -58,6 +58,10 @@ typedef SWFFontCollection  SWF__FontCollection;
+ #define aTHXo_
+ #endif
+ 
++#ifndef GvCV_set
++# define GvCV_set(G, C) (GvCV(G) = (C))
++#endif
++
+ #ifndef S_DEBUG
+ #define swf_debug 0   /* Should we get this from, say, $SWF::debug? */
+ #define S_DEBUG(level,code)  if (swf_debug >= level) { code; }
+-- 
+1.7.5.4
+
diff --git a/media-libs/ming/ming-0.4.3-r2.ebuild b/media-libs/ming/ming-0.4.3-r2.ebuild
new file mode 100644
index 000000000000..19d721b55eec
--- /dev/null
+++ b/media-libs/ming/ming-0.4.3-r2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.4.3-r2.ebuild,v 1.1 2011/11/16 00:56:48 xmw Exp $
+
+EAPI="3"
+
+PHP_EXT_NAME=ming
+PHP_EXT_OPTIONAL_USE=php
+PYTHON_DEPEND="python? 2"
+
+inherit eutils autotools flag-o-matic multilib php-ext-source-r2 perl-module python
+
+DESCRIPTION="An Open Source library for Flash movie generation."
+HOMEPAGE="http://ming.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ming/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+perl +python php static-libs"
+
+RDEPEND="perl? ( dev-lang/perl )
+	python? ( dev-lang/python )
+	media-libs/freetype
+	media-libs/libpng
+	media-libs/giflib
+	sys-libs/zlib
+	!media-libs/libswf"
+DEPEND="${DEPEND}
+	sys-devel/flex
+	virtual/yacc"
+
+S=${WORKDIR}/${P/_/.}
+
+# Tests only work when the package is tested on a system
+# which does not presently have any version of ming installed.
+RESTRICT="test"
+
+pkg_setup() {
+	use python && python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng-1.5.patch
+	epatch "${FILESDIR}"/${P}-perl-5.14.patch
+
+	# Let's get rid of the TEXTRELS, link dynamic. Use gif.
+	sed -i \
+		-e 's/libming.a/libming.so/' \
+		-e 's/lungif/lgif/' \
+		perl_ext/Makefile.PL
+	sed -i \
+		-e 's/ungif/gif/' \
+		py_ext/setup.py.in
+
+	if use php; then
+		cd "${S}/php_ext"
+		php-ext-source-r2_phpize
+		cd "${S}"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	# build is sensitive to -O3 (bug #297437)
+	replace-flags -O3 -O2
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable perl) \
+		$(use_enable python)
+}
+
+src_compile() {
+	emake || die
+
+	if use php; then
+		cd "${S}"/php_ext
+		myconf="--disable-rpath
+			--disable-static
+			--with-ming"
+		php-ext-source-r2_src_compile
+	fi
+}
+
+src_test() {
+	emake check || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS="vendor" install || die
+
+	rm -f "${ED}"usr/lib*/lib${PN}.la
+
+	fixlocalpod
+
+	# Get rid of the precompiled stuff, we generate it later.
+	find "${ED}" -name "*.pyc" -print0 | xargs -0 rm -f
+
+	if use php; then
+		cd "${S}"/php_ext
+		php-ext-source-r2_src_install
+	fi
+}
+
+pkg_postinst() {
+	use perl && perl-module_pkg_postinst
+	use python && python_mod_optimize ming.py mingc.py
+}
+
+pkg_prerm() {
+	use perl && perl-module_pkg_prerm
+}
+
+pkg_postrm() {
+	use perl && perl-module_pkg_postrm
+	use python && python_mod_cleanup ming.py mingc.py
+}