Cleanup.

(Portage version: 2.1.2-r10)

4 files changed, 80 insertions, 49 deletions

diff --git a/media-libs/ming/ChangeLog b/media-libs/ming/ChangeLog
index 1969e8b67825..3f1069c65118 100644
--- a/media-libs/ming/ChangeLog
+++ b/media-libs/ming/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/ming
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.26 2007/02/22 16:57:24 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.27 2007/02/22 17:12:25 chtekk Exp $
+
+  22 Feb 2007; Luca Longinotti <chtekk@gentoo.org> ming-0.2a.ebuild,
+  ming-0.2a-r3.ebuild, ming-0.3.0.ebuild:
+  Cleanup.
 
   22 Feb 2007; Luca Longinotti <chtekk@gentoo.org> metadata.xml,
   ming-0.3.0.ebuild:
diff --git a/media-libs/ming/ming-0.2a-r3.ebuild b/media-libs/ming/ming-0.2a-r3.ebuild
index 5dc68f70c90b..92ea6609f813 100644
--- a/media-libs/ming/ming-0.2a-r3.ebuild
+++ b/media-libs/ming/ming-0.2a-r3.ebuild
@@ -1,85 +1,97 @@
 # Copyright 1999-2007 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.3 2007/02/22 16:57:24 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.2a-r3.ebuild,v 1.4 2007/02/22 17:12:25 chtekk Exp $
 
-inherit eutils toolchain-funcs flag-o-matic python
+inherit eutils toolchain-funcs flag-o-matic python multilib
 
-DESCRIPTION="A OpenSource library from flash movie generation"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+DESCRIPTION="An Open Source library for 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 ~x86-fbsd"
 IUSE="python"
 
-RDEPEND="python? ( virtual/python )
-		 virtual/libc"
+RDEPEND="python? ( virtual/python )"
+
 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
-	EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/${P}-make.patch
+	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"
+	EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}/${P}-make.patch"
 }
 
 src_compile() {
-	einfo "Regenerating parser files..."
+	einfo "Regenerating parser files ..."
 	cd "${S}/src/actioncompiler"
-	for f in *.flex; do
+	for f in *.flex ; do
 		flex "${f}" || die "Failed to flex: ${f}"
 	done
 	append-flags -Wall
-	einfo "Compiling..."
+
+	einfo "Compiling ..."
 	cd "${S}"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
+	emake CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -Wl,-soname,libming.so" \
-		all || die "Failed to build libs"
+		all \
+		|| die "Failed to build libs"
 	cd "${S}/util"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+	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
+	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}" \
+		emake CC="$(tc-getCC)" \
+			CFLAGS="${CFLAGS}" \
+			LDFLAGS="${LDFLAGS}" \
 			PYINCDIR="${PYINCDIR}" PYLIBDIR="${PYLIBDIR}" \
-			mingcmodule.so || die "Failed to build mingcmodule.so"
+			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"
+	newlib.so libming.so libming.so.0.2 || die "newlib.so libming.so failed"
+
 	insinto /usr/include
-	doins ming.h mingpp.h || die "include"
+	doins ming.h mingpp.h || die "doins ming.h/mingpp.h failed"
+
 	exeinto /usr/$(get_libdir)/ming
-	doexe util/{bindump,hexdump,listswf,listfdb,listmp3,listjpeg,makefdb,swftophp} || die "utils"
+	doexe util/{bindump,hexdump,listswf,listfdb,listmp3,listjpeg,makefdb,swftophp} || die "doexe utils failed"
+
 	dodoc CHANGES CREDITS README TODO
 	newdoc util/README README.util
 	newdoc util/TODO TODO.util
-	if use python; then
-		cd ${S}/py_ext
+
+	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"
+		insinto "${PYLIBDIR}/site-packages"
+		doins mingcmodule.so ming.py || die "Failed to install python extension"
 		newdoc README README.python
 		newdoc TODO TODO.python
 		newdoc INSTALL INSTALL.python
 		dodoc test.py shape.py
 	fi
 }
+
 pkg_postinst() {
-	if use python; then
+	if use python ; then
 		python_version
 		python_mod_compile /usr/$(get_libdir)/python${PYVER}/site-packages/ming.py
 	fi
diff --git a/media-libs/ming/ming-0.2a.ebuild b/media-libs/ming/ming-0.2a.ebuild
index 2b8d9053ef71..a466472a1461 100644
--- a/media-libs/ming/ming-0.2a.ebuild
+++ b/media-libs/ming/ming-0.2a.ebuild
@@ -1,38 +1,43 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.2a.ebuild,v 1.25 2007/02/22 16:57:24 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.2a.ebuild,v 1.26 2007/02/22 17:12:25 chtekk Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs multilib
 
-DESCRIPTION="A OpenSource library from flash movie generation"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
+
+DESCRIPTION="An Open Source library for 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=""
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-fpic.patch
-	epatch ${FILESDIR}/${PF}-gentoo.diff
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-fpic.patch"
+	epatch "${FILESDIR}/${P}-gentoo.diff"
 }
 
 src_compile() {
-	make CC="$(tc-getCC) -Wall" all static || die
+	cd "${S}"
+	make CC="$(tc-getCC) -Wall" all static || die "make failed"
 	cd util
-	make CC="$(tc-getCC) -Wall" bindump hexdump listswf listfdb listmp3 listjpeg makefdb swftophp || die
+	make CC="$(tc-getCC) -Wall" bindump hexdump listswf listfdb listmp3 listjpeg makefdb swftophp || die "make utils failed"
 }
 
 src_install() {
-	dolib.so libming.so || die "lib.so"
-	dolib.a libming.a || die "lib.a"
+	dolib.so libming.so || die "dolib.so libming.so failed"
+	dolib.a libming.a || die "dolib.a libming.a failed"
+
 	insinto /usr/include
-	doins ming.h || die "include"
+	doins ming.h || die "doins ming.h failed"
+
 	exeinto /usr/$(get_libdir)/ming
-	doexe util/{bindump,hexdump,listswf,listfdb,listmp3,listjpeg,makefdb,swftophp} || die "utils"
+	doexe util/{bindump,hexdump,listswf,listfdb,listmp3,listjpeg,makefdb,swftophp} || die "doexe utils failed"
+
 	dodoc CHANGES CREDITS README TODO
 	newdoc util/README README.util
 	newdoc util/TODO TODO.util
diff --git a/media-libs/ming/ming-0.3.0.ebuild b/media-libs/ming/ming-0.3.0.ebuild
index fd9f1de84f9c..c70bb68dc61a 100644
--- a/media-libs/ming/ming-0.3.0.ebuild
+++ b/media-libs/ming/ming-0.3.0.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.3.0.ebuild,v 1.4 2007/02/22 16:57:24 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.3.0.ebuild,v 1.5 2007/02/22 17:12:25 chtekk Exp $
 
 inherit eutils toolchain-funcs java-pkg perl-module python distutils
 
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
 DESCRIPTION="An Open Source library for Flash movie generation."
 HOMEPAGE="http://ming.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ming/${P}.tar.gz
@@ -11,11 +13,9 @@ SRC_URI="mirror://sourceforge/ming/${P}.tar.gz
 		perl? ( mirror://sourceforge/ming/${PN}-perl-${PV}.tar.gz )
 		python? ( mirror://sourceforge/ming/${PN}-py-${PV}.tar.gz )"
 
-IUSE="java perl python"
-
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="java perl python"
 
 RDEPEND="java? ( virtual/jre )
 		perl? ( dev-lang/perl )
@@ -37,16 +37,19 @@ src_compile() {
 	cd "${S}"
 	econf || die "econf failed"
 	emake DESTDIR="${D}" || die "emake failed"
+
 	if use java ; then
 		cd "${S}/java_ext"
 		make || "java emake failed"
 	fi
+
 	if use perl ; then
 		cd "${S}/perl_ext"
 		perl-module_src_compile || "perl make failed"
 		perl-module_pkg_setup
 		perl-module_pkg_preinst
 	fi
+
 	if use python ; then
 		cd "${S}/py_ext"
 		python_version
@@ -58,21 +61,27 @@ src_install() {
 	insopts -m0644
 	insinto /usr/include
 	doins src/ming.h src/ming_config.h mingpp.h
+
 	dolib libming.so libming.so.0 libming.so.${PV} libming.a
+
 	dodoc ChangeLog CREDITS HISTORY INSTALL LICENSE LICENSE_GPL2 NEWS README TODO
 	doman man/makeswf.1
+
 	cd "${S}/util"
 	dobin listswf listswf_d swftoperl swftophp swftopython makeswf listaction listaction_d listfdb makefdb listjpeg \
 		raw2adpcm listmp3 gif2dbl gif2mask png2dbl png2swf ming-config dbl2png
+
 	if use java ; then
 		cd "${S}/java_ext"
 		java-pkg_doclass jswf.jar
 	fi
+
 	if use perl ; then
 		cd "${S}/perl_ext"
 		perl-module_src_install
 		dodoc CREDITS README SUPPORT TODO
 	fi
+
 	if use python ; then
 		cd "${S}/py_ext"
 		distutils_src_install
@@ -86,6 +95,7 @@ pkg_postinst() {
 		einfo "You may want to add ming to the java classpath by running"
 		einfo "java-config --add-[user|system]-classpath=ming"
 	fi
+
 	if use perl ; then
 		perl-module_pkg_postinst
 	fi