From 2e8a6e907ad109563fffea18fcc94e491298cc78 Mon Sep 17 00:00:00 2001 From: Luca Longinotti Date: Thu, 22 Feb 2007 17:12:25 +0000 Subject: [PATCH] Cleanup. Package-Manager: portage-2.1.2-r10 --- media-libs/ming/ChangeLog | 6 ++- media-libs/ming/Manifest | 32 ++++++------- media-libs/ming/ming-0.2a-r3.ebuild | 74 +++++++++++++++++------------ media-libs/ming/ming-0.2a.ebuild | 31 +++++++----- media-libs/ming/ming-0.3.0.ebuild | 18 +++++-- 5 files changed, 96 insertions(+), 65 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 ming-0.2a.ebuild, + ming-0.2a-r3.ebuild, ming-0.3.0.ebuild: + Cleanup. 22 Feb 2007; Luca Longinotti metadata.xml, ming-0.3.0.ebuild: diff --git a/media-libs/ming/Manifest b/media-libs/ming/Manifest index 3769bc959f81..4c9633ca1a5b 100644 --- a/media-libs/ming/Manifest +++ b/media-libs/ming/Manifest @@ -23,22 +23,22 @@ DIST ming-0.3.0.tar.gz 287330 RMD160 b41c93e28c221d9ae35666f34ca3ed37bbb0dfcb SH DIST ming-java-0.3.0.tar.gz 19373 RMD160 62549a05b23f46e8860239cfeb81bc983b48be59 SHA1 1750221b7733e4c0e62e33bdd2be313727487768 SHA256 a51336aaa9855cbcae228faea98bedf30109e26dba934b4248594e88c449c0c1 DIST ming-perl-0.3.0.tar.gz 49783 RMD160 3cb5054e0166ddded383c7594c38b2a633333717 SHA1 854c62539fc06f96b4f3c1b4614f76c7b3d84daf SHA256 44bbcec7f41f33fcf402d0e43bdf7aa61d567ab098247f114674a8786d98e2b5 DIST ming-py-0.3.0.tar.gz 35658 RMD160 35471ccea9fa2b12be54d8dc3f895b3945572974 SHA1 21f719d0f630e072b930336c970793f14b1f3127 SHA256 507abbfa394bcbe22f3f8eee936b5f8048c957b2b7a2543cfacc00cf68a4c075 -EBUILD ming-0.2a-r3.ebuild 2791 RMD160 76356aaccdbee7ee92edd7421b4ea0f4abf38901 SHA1 1679a7e172b934b5d2ec6bb01ce9e983098a22da SHA256 01aa09d03cf5024b949b1322440651c5532d502e9a826347361e3f2fbfd8f2ff -MD5 639f8bfb55ad00717701b8e251a32f32 ming-0.2a-r3.ebuild 2791 -RMD160 76356aaccdbee7ee92edd7421b4ea0f4abf38901 ming-0.2a-r3.ebuild 2791 -SHA256 01aa09d03cf5024b949b1322440651c5532d502e9a826347361e3f2fbfd8f2ff ming-0.2a-r3.ebuild 2791 -EBUILD ming-0.2a.ebuild 1160 RMD160 86850255aa414d40913ad8d5610a815946093702 SHA1 f196b87068caef666e0e8fa18dc551c7c530c88f SHA256 eb17a4a25a1f4a86d085c50165b68103e7c5dcbc286de0f3d40334a055e28132 -MD5 652d2f36d81bdfe15f52e2ebf263e549 ming-0.2a.ebuild 1160 -RMD160 86850255aa414d40913ad8d5610a815946093702 ming-0.2a.ebuild 1160 -SHA256 eb17a4a25a1f4a86d085c50165b68103e7c5dcbc286de0f3d40334a055e28132 ming-0.2a.ebuild 1160 -EBUILD ming-0.3.0.ebuild 2457 RMD160 ade82926525ef4f501b716f356bce64912ebe065 SHA1 c2dd13b6e55f380030b2a97acbe243353615ddcb SHA256 f330abfba25739c9dba8de0a91ae605ca9f7c339379d0d639f68a4068de710e1 -MD5 0a0a2578aaeb134848a96bef437fcbf0 ming-0.3.0.ebuild 2457 -RMD160 ade82926525ef4f501b716f356bce64912ebe065 ming-0.3.0.ebuild 2457 -SHA256 f330abfba25739c9dba8de0a91ae605ca9f7c339379d0d639f68a4068de710e1 ming-0.3.0.ebuild 2457 -MISC ChangeLog 3441 RMD160 8f5dfda1573394033bfa36b4e0fdcf76ff806c3c SHA1 bdc9a6ee77ea620c59445d108893765543268067 SHA256 215e74507c7dae7bc497a1c034daa0f3f110738a357caf2a4984f0327a5ac80b -MD5 8ceb916e37c7f66830008375e8dbc9f2 ChangeLog 3441 -RMD160 8f5dfda1573394033bfa36b4e0fdcf76ff806c3c ChangeLog 3441 -SHA256 215e74507c7dae7bc497a1c034daa0f3f110738a357caf2a4984f0327a5ac80b ChangeLog 3441 +EBUILD ming-0.2a-r3.ebuild 2803 RMD160 6c2e4ae1102cf8d61eeeb0391172db2f1137a1c8 SHA1 46d3f7619ae26dc2b1bf3d85c1e7e2e4bd6f356f SHA256 4ad385f0c8ad41c6347f556a849c398f9e2e147edaf20f7155827252cb75a3ae +MD5 a5e27e920efd384a69a07ded89edbc27 ming-0.2a-r3.ebuild 2803 +RMD160 6c2e4ae1102cf8d61eeeb0391172db2f1137a1c8 ming-0.2a-r3.ebuild 2803 +SHA256 4ad385f0c8ad41c6347f556a849c398f9e2e147edaf20f7155827252cb75a3ae ming-0.2a-r3.ebuild 2803 +EBUILD ming-0.2a.ebuild 1289 RMD160 094a3f91eee05e49aeeae13a54c4287bafbbfb8a SHA1 550c3808962dbdc3aec9ce1c89d769ca2cbb5a9b SHA256 f793a025fdd657f1b0eed2bcb6c67e32f745c574dd58c0895270e3cf6f15dfd4 +MD5 fd90b5ee3b5e36a3f19556868b7e5ff2 ming-0.2a.ebuild 1289 +RMD160 094a3f91eee05e49aeeae13a54c4287bafbbfb8a ming-0.2a.ebuild 1289 +SHA256 f793a025fdd657f1b0eed2bcb6c67e32f745c574dd58c0895270e3cf6f15dfd4 ming-0.2a.ebuild 1289 +EBUILD ming-0.3.0.ebuild 2467 RMD160 28e4527c262fa58477de5cef0125ae887126528b SHA1 e0943c268ae1b323447b96be9c3ce1f6fd1298b3 SHA256 a203f2058a3e6e97dd573f58a62de6e18af661f53cfbb04e91d1940d43537822 +MD5 07405cbdfb5b5a2d6f62d7a19632a4db ming-0.3.0.ebuild 2467 +RMD160 28e4527c262fa58477de5cef0125ae887126528b ming-0.3.0.ebuild 2467 +SHA256 a203f2058a3e6e97dd573f58a62de6e18af661f53cfbb04e91d1940d43537822 ming-0.3.0.ebuild 2467 +MISC ChangeLog 3564 RMD160 769487e8f38add4169a27538db41113d66bf4ca6 SHA1 2b95bb4a1d6840f29527e4b1dd5947a16fdebd61 SHA256 fad7d0bb45aed50fd667bef731c76a0139ad3e4fbdf431314ff7f868895694aa +MD5 45a917752ca29d3c5dbe2abc91de4496 ChangeLog 3564 +RMD160 769487e8f38add4169a27538db41113d66bf4ca6 ChangeLog 3564 +SHA256 fad7d0bb45aed50fd667bef731c76a0139ad3e4fbdf431314ff7f868895694aa ChangeLog 3564 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157 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 -- 2.26.2