Bug #123728, fix python module linking brokenness. Also fix QA issue of missing SONAME.

Package-Manager: portage-2.1

5 files changed, 158 insertions, 26 deletions

diff --git a/media-libs/ming/ChangeLog b/media-libs/ming/ChangeLog
index e2edc748ebe0..e1947a2e582d 100644
--- a/media-libs/ming/ChangeLog
+++ b/media-libs/ming/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/ming
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.19 2006/03/07 11:56:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.20 2006/06/11 12:19:48 robbat2 Exp $
+
+*ming-0.2a-r3 (11 Jun 2006)
+
+  11 Jun 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/ming-0.2a-linking.patch, +ming-0.2a-r3.ebuild:
+  Bug #123728, fix python module linking brokenness. Also fix QA issue of
+  missing SONAME.
 
   07 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> +metadata.xml,
   ming-0.2a.ebuild, ming-0.2a-r1.ebuild:
diff --git a/media-libs/ming/Manifest b/media-libs/ming/Manifest
index 28373283f632..90c5f15fe367 100644
--- a/media-libs/ming/Manifest
+++ b/media-libs/ming/Manifest
@@ -1,40 +1,49 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c6b212eeb9d4265ac519d89e4482bbfa ChangeLog 2297
-RMD160 166f1fb0a3d3447a63524d55969c0f12f795977e ChangeLog 2297
-SHA256 c6a20b73502c2e6696f1c96489ff5252524a37a257c3f2b0a710c99c1a79105a ChangeLog 2297
-MD5 6a50642c5c8129217df944bf99398c6e files/digest-ming-0.2a 58
-RMD160 dee6449393d9e1e46db92a746d9fa7be3c53f8b7 files/digest-ming-0.2a 58
-SHA256 b0328341f2c6f6e615797cd458acb6d74bec8913fce578ece50bf1e0dd069ed6 files/digest-ming-0.2a 58
-MD5 6a50642c5c8129217df944bf99398c6e files/digest-ming-0.2a-r1 58
-RMD160 dee6449393d9e1e46db92a746d9fa7be3c53f8b7 files/digest-ming-0.2a-r1 58
-SHA256 b0328341f2c6f6e615797cd458acb6d74bec8913fce578ece50bf1e0dd069ed6 files/digest-ming-0.2a-r1 58
-MD5 6a50642c5c8129217df944bf99398c6e files/digest-ming-0.2a-r2 58
-RMD160 dee6449393d9e1e46db92a746d9fa7be3c53f8b7 files/digest-ming-0.2a-r2 58
-SHA256 b0328341f2c6f6e615797cd458acb6d74bec8913fce578ece50bf1e0dd069ed6 files/digest-ming-0.2a-r2 58
+AUX ming-0.2a-fpic.patch 1814 RMD160 b033493ac9c522774acaa81b2ddd68a46b995a9e SHA1 7c3144646a27c5b4474bce6c8efd26f8e86b3636 SHA256 54b7a3492a9136eb91b09dd36b07049db38adb110d08a2f734c752bfda2d815b
 MD5 0d2b63f032d402518c9384d5db4404b1 files/ming-0.2a-fpic.patch 1814
 RMD160 b033493ac9c522774acaa81b2ddd68a46b995a9e files/ming-0.2a-fpic.patch 1814
 SHA256 54b7a3492a9136eb91b09dd36b07049db38adb110d08a2f734c752bfda2d815b files/ming-0.2a-fpic.patch 1814
+AUX ming-0.2a-gentoo.diff 369 RMD160 9db5b5e84dd46c794e6502f51c67e5b146c35e51 SHA1 46e25c3614a9b45c1df9111fd548917be6173029 SHA256 0c78843c402ec5e6df5e97a2cef8e9ab72961749e059b95dbf565e770b24a666
 MD5 e086353fa9ba2b2e6b9ca9c87b04a367 files/ming-0.2a-gentoo.diff 369
 RMD160 9db5b5e84dd46c794e6502f51c67e5b146c35e51 files/ming-0.2a-gentoo.diff 369
 SHA256 0c78843c402ec5e6df5e97a2cef8e9ab72961749e059b95dbf565e770b24a666 files/ming-0.2a-gentoo.diff 369
-MD5 ed8349e980407e49b724e04ee5a9a2ed metadata.xml 231
-RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c metadata.xml 231
-SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a metadata.xml 231
+AUX ming-0.2a-linking.patch 1115 RMD160 4857939ffbb2fd852f866e5135ac762d9d8a383a SHA1 70d6a3dbb81600a82b0f59f34b7fca9a4afddaf3 SHA256 1d81fd16680d1dbdbb797cd88874efd4f4bd76f0d159496c83a2d307244efdf4
+MD5 2e40db07f5d7c10ef83b8cbadcc0ccd5 files/ming-0.2a-linking.patch 1115
+RMD160 4857939ffbb2fd852f866e5135ac762d9d8a383a files/ming-0.2a-linking.patch 1115
+SHA256 1d81fd16680d1dbdbb797cd88874efd4f4bd76f0d159496c83a2d307244efdf4 files/ming-0.2a-linking.patch 1115
+DIST ming-0.2a.tgz 316447
+EBUILD ming-0.2a-r1.ebuild 2054 RMD160 e443f8c5258a23243a6d99eddcc041eacb8eed88 SHA1 709fca2ded4a0b5b7fe76193c2d71f151c4a85fc SHA256 e1b1a7cfd877095928f6e710fbb97fc0308f15ac4b4a3356f4715984e47ce38c
 MD5 bd8beb3aae8b0694bb3cfed4987ea0c2 ming-0.2a-r1.ebuild 2054
 RMD160 e443f8c5258a23243a6d99eddcc041eacb8eed88 ming-0.2a-r1.ebuild 2054
 SHA256 e1b1a7cfd877095928f6e710fbb97fc0308f15ac4b4a3356f4715984e47ce38c ming-0.2a-r1.ebuild 2054
+EBUILD ming-0.2a-r2.ebuild 2222 RMD160 4fd777f03068d402a9fdcd658348fac184cb7853 SHA1 b7944e0fe75d4fc132402b75a6819d5548789504 SHA256 58dc14eb780b3e91593844d930328b5f517b453657e6959359988ffb6124f153
 MD5 b2dfb3a9b6846fff7079f57c20f81526 ming-0.2a-r2.ebuild 2222
 RMD160 4fd777f03068d402a9fdcd658348fac184cb7853 ming-0.2a-r2.ebuild 2222
 SHA256 58dc14eb780b3e91593844d930328b5f517b453657e6959359988ffb6124f153 ming-0.2a-r2.ebuild 2222
+EBUILD ming-0.2a-r3.ebuild 2719 RMD160 65acd1a48035a021784d2c2dba6f0e908080cf30 SHA1 62dc360a0a3aa99814a1315061cc363294016ac2 SHA256 d3c5c73d23075229b999bc825fa0df41ba624e50627ff5996f3dd40a55e73ba7
+MD5 2bf33509987a1cade2fd4b4717091c14 ming-0.2a-r3.ebuild 2719
+RMD160 65acd1a48035a021784d2c2dba6f0e908080cf30 ming-0.2a-r3.ebuild 2719
+SHA256 d3c5c73d23075229b999bc825fa0df41ba624e50627ff5996f3dd40a55e73ba7 ming-0.2a-r3.ebuild 2719
+EBUILD ming-0.2a.ebuild 1163 RMD160 1a46af5263a1e1e1d546ba3948e84cb5c9f6bb0a SHA1 5d43153a7d1a551f91102bd2d1b49f38a66dbdf0 SHA256 698243eefa4720d891d8c4f460ab0596f7bd175c68e5d02a5eb5c6a5b91b27bc
 MD5 6e8e25682a0a27c2f29a89dcfc12a201 ming-0.2a.ebuild 1163
 RMD160 1a46af5263a1e1e1d546ba3948e84cb5c9f6bb0a ming-0.2a.ebuild 1163
 SHA256 698243eefa4720d891d8c4f460ab0596f7bd175c68e5d02a5eb5c6a5b91b27bc ming-0.2a.ebuild 1163
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEDXTiAiZjviIA2XgRAm2GAJ0UkjKzi1nahJMUMGp6awf5Pp5JnQCeMPra
-51MtIGyHIdZWEsK/jPnROIk=
-=zQgs
------END PGP SIGNATURE-----
+MISC ChangeLog 2526 RMD160 494a7d8cef6101edb220ff37edd0ae0f52571576 SHA1 a2fcbe219c81088f40e045b92087cb31a47874cf SHA256 a363cbd029640a8281b3345da46dcc67bdb4f14a22742f7eb1c81fafbe315781
+MD5 dd56dfa6c456efdce515fed358cbfa97 ChangeLog 2526
+RMD160 494a7d8cef6101edb220ff37edd0ae0f52571576 ChangeLog 2526
+SHA256 a363cbd029640a8281b3345da46dcc67bdb4f14a22742f7eb1c81fafbe315781 ChangeLog 2526
+MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
+MD5 ed8349e980407e49b724e04ee5a9a2ed metadata.xml 231
+RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c metadata.xml 231
+SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a metadata.xml 231
+MD5 6a50642c5c8129217df944bf99398c6e files/digest-ming-0.2a 58
+RMD160 dee6449393d9e1e46db92a746d9fa7be3c53f8b7 files/digest-ming-0.2a 58
+SHA256 b0328341f2c6f6e615797cd458acb6d74bec8913fce578ece50bf1e0dd069ed6 files/digest-ming-0.2a 58
+MD5 6a50642c5c8129217df944bf99398c6e files/digest-ming-0.2a-r1 58
+RMD160 dee6449393d9e1e46db92a746d9fa7be3c53f8b7 files/digest-ming-0.2a-r1 58
+SHA256 b0328341f2c6f6e615797cd458acb6d74bec8913fce578ece50bf1e0dd069ed6 files/digest-ming-0.2a-r1 58
+MD5 6a50642c5c8129217df944bf99398c6e files/digest-ming-0.2a-r2 58
+RMD160 dee6449393d9e1e46db92a746d9fa7be3c53f8b7 files/digest-ming-0.2a-r2 58
+SHA256 b0328341f2c6f6e615797cd458acb6d74bec8913fce578ece50bf1e0dd069ed6 files/digest-ming-0.2a-r2 58
+MD5 6a50642c5c8129217df944bf99398c6e files/digest-ming-0.2a-r3 58
+RMD160 dee6449393d9e1e46db92a746d9fa7be3c53f8b7 files/digest-ming-0.2a-r3 58
+SHA256 b0328341f2c6f6e615797cd458acb6d74bec8913fce578ece50bf1e0dd069ed6 files/digest-ming-0.2a-r3 58
diff --git a/media-libs/ming/files/digest-ming-0.2a-r3 b/media-libs/ming/files/digest-ming-0.2a-r3
new file mode 100644
index 000000000000..146ed635587e
--- /dev/null
+++ b/media-libs/ming/files/digest-ming-0.2a-r3
@@ -0,0 +1 @@
+MD5 72b25da0af28d9cb025c2aaf3fd0185c ming-0.2a.tgz 316447
diff --git a/media-libs/ming/files/ming-0.2a-linking.patch b/media-libs/ming/files/ming-0.2a-linking.patch
new file mode 100644
index 000000000000..7cfe815e2ac0
--- /dev/null
+++ b/media-libs/ming/files/ming-0.2a-linking.patch
@@ -0,0 +1,30 @@
+diff -Nuar --exclude '*~' ming-0.2a.orig/py_ext/Makefile ming-0.2a/py_ext/Makefile
+--- ming-0.2a.orig/py_ext/Makefile	2006-06-11 03:55:18.102054000 -0700
++++ ming-0.2a/py_ext/Makefile	2006-06-11 03:59:15.500918176 -0700
+@@ -7,7 +7,7 @@
+ all:
+ 
+ mingcmodule.so: ming_wrap.o
+-	$(CC) $(CFLAGS) -shared -o mingcmodule.so ming_wrap.o -lming
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L.. -lming 
+ 
+ mingc.pyd: ming_wrap.o
+ 	dllwrap --dllname mingc.pyd --driver-name gcc --def mingc.def \
+diff -Nuar --exclude '*~' ming-0.2a.orig/src/Makefile ming-0.2a/src/Makefile
+--- ming-0.2a.orig/src/Makefile	2006-06-11 03:55:18.076055000 -0700
++++ ming-0.2a/src/Makefile	2006-06-11 04:04:20.289175057 -0700
+@@ -24,7 +24,7 @@
+ dynamic: ${OFILES}
+ 	cd blocks && make
+ 	cd actioncompiler && make
+-	${CC} ${CFLAGS} ${OFILES} ${COMPILEROFILES} blocks/*.o -shared \
++	${CC} ${CFLAGS} ${LDFLAGS} ${OFILES} ${COMPILEROFILES} blocks/*.o -shared \
+ 	  -o libming.so
+ 	cp libming.so ..
+ 
+@@ -45,4 +45,4 @@
+ #	${CC} ${FLAGS} -c $<
+ 
+ test: static test.o
+-	${CC} -o test test.o libming.a -lm
++	${CC} ${LDFLAGS} -o test test.o libming.a -lm
diff --git a/media-libs/ming/ming-0.2a-r3.ebuild b/media-libs/ming/ming-0.2a-r3.ebuild
new file mode 100644
index 000000000000..19c77d94e81d
--- /dev/null
+++ b/media-libs/ming/ming-0.2a-r3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.2a-r3.ebuild,v 1.1 2006/06/11 12:19:48 robbat2 Exp $
+
+inherit eutils toolchain-funcs flag-o-matic python
+
+DESCRIPTION="A OpenSource library from flash movie generation"
+HOMEPAGE="http://www.opaque.net/ming/"
+SRC_URI="http://www.opaque.net/ming/${P}.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="python"
+
+RDEPEND="python? ( virtual/python )
+		 virtual/libc"
+DEPEND="${RDEPEND}
+		sys-devel/flex"
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-p0 -d${S}" epatch "${FILESDIR}"/${P}-fpic.patch
+	EPATCH_OPTS="-p0 -d${S}" epatch "${FILESDIR}"/${P}-gentoo.diff
+	sed -e 's,gcc -g -Wall,$(CC) $(CFLAGS),g' -i ${S}/py_ext/Makefile
+	EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/${P}-linking.patch
+}
+
+src_compile() {
+	einfo "Regenerating parser files..."
+	cd "${S}/src/actioncompiler"
+	for f in *.flex; do
+		flex "${f}" || die "Failed to flex: ${f}"
+	done
+	append-flags -Wall
+	einfo "Compiling..."
+	cd "${S}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS} -Wl,-soname,libming.so" \
+		all || die "Failed to build libs"
+	cd "${S}/util"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		bindump hexdump listswf listfdb listmp3 listjpeg makefdb swftophp \
+		|| die "Failed to build utils"
+	if use python; then
+		cd ${S}/py_ext
+		python_version
+		my_python="python${PYVER}"
+		PYLIBDIR="/usr/$(get_libdir)/python${PYVER}"
+		PYINCDIR="/usr/include/python${PYVER}"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+			PYINCDIR="${PYINCDIR}" PYLIBDIR="${PYLIBDIR}" \
+			mingcmodule.so || die "Failed to build mingcmodule.so"
+	fi
+}
+
+src_install() {
+	newlib.so libming.so libming.so.0.2 || die "lib.so"
+	# Static lib is obsolete, and bad, as it contains PIC code
+	#dolib.a libming.a || die "lib.a"
+	insinto /usr/include
+	doins ming.h mingpp.h || die "include"
+	exeinto /usr/$(get_libdir)/ming
+	doexe util/{bindump,hexdump,listswf,listfdb,listmp3,listjpeg,makefdb,swftophp} || die "utils"
+	dodoc CHANGES CREDITS README TODO
+	newdoc util/README README.util
+	newdoc util/TODO TODO.util
+	if use python; then
+		cd ${S}/py_ext
+		python_version
+		PYLIBDIR="/usr/$(get_libdir)/python${PYVER}"
+		insinto ${PYLIBDIR}/site-packages
+		doins mingcmodule.so ming.py || die "Failed to install python stuff"
+		newdoc README README.python
+		newdoc TODO TODO.python
+		newdoc INSTALL INSTALL.python
+		dodoc test.py shape.py
+	fi
+}
+pkg_postinst() {
+	if use python; then
+		python_version
+		python_mod_compile /usr/$(get_libdir)/python${PYVER}/site-packages/ming.py
+	fi
+}