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

(Portage version: 2.1)

4 files changed, 124 insertions, 1 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/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
+}