[proaudio] [2602] media-libs/gmerlin: move to EAPI 5 and autotools-utils, force disable esound, keyword for ~x86, add use flag descriptions, cleanup

[subversion@xxxxxxxxxxxxx]

Revision: 2602
Author:   lilrc
Date:     2013-03-29 01:37:14 +0100 (Fri, 29 Mar 2013)
Log Message:
-----------
media-libs/gmerlin: move to EAPI 5 and autotools-utils, force disable esound, keyword for ~x86, add use flag descriptions, cleanup

Modified Paths:
--------------
    trunk/overlays/proaudio/media-libs/gmerlin/ChangeLog
    trunk/overlays/proaudio/media-libs/gmerlin/Manifest
    trunk/overlays/proaudio/media-libs/gmerlin/gmerlin-1.2.0.ebuild
    trunk/overlays/proaudio/media-libs/gmerlin/metadata.xml

Added Paths:
-----------
    trunk/overlays/proaudio/media-libs/gmerlin/files/gmerlin-1.2.0-makefile-am.patch

Removed Paths:
-------------
    trunk/overlays/proaudio/media-libs/gmerlin/gmerlin-0.3.8.ebuild

Modified: trunk/overlays/proaudio/media-libs/gmerlin/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-libs/gmerlin/ChangeLog	2013-03-28 21:20:26 UTC (rev 2601)
+++ trunk/overlays/proaudio/media-libs/gmerlin/ChangeLog	2013-03-29 00:37:14 UTC (rev 2602)
@@ -1,7 +1,16 @@
 # ChangeLog for media-libs/gmerlin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Mar 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+  -gmerlin-0.3.8.ebuild, gmerlin-1.2.0.ebuild, metadata.xml:
+  Move to EAPI 5 and autotools-utils.
+  Force disable esound support.
+  Remove unused USE flags.
+  Keyword for ~x86.
+  Add USE flag descriptions.
+  Remove old ebuild.
+
   22 Jun 2012; Frieder Buerzele <evermind@xxxxxxxxxxxxx> -gmerlin-1.0.0.ebuild,
   +gmerlin-1.2.0.ebuild:
   bumped and changed to virtual/jpeg

Modified: trunk/overlays/proaudio/media-libs/gmerlin/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/gmerlin/Manifest	2013-03-28 21:20:26 UTC (rev 2601)
+++ trunk/overlays/proaudio/media-libs/gmerlin/Manifest	2013-03-29 00:37:14 UTC (rev 2602)
@@ -1,7 +1,6 @@
-AUX gmerlin-cflags.patch 354 RMD160 a4079a10ca5b9d75942bf8ce47691581946b3e3f SHA1 e75443d2706539dea784f492c9b6d22871f70d75 SHA256 bb6fe86a057fb4c18b80825b11d259535ef1051e95fee7e3a1582b05d23d946e
-DIST gmerlin-0.3.8.tar.gz 2259185 RMD160 9b955c39aaf074d26dfdae4492b2bf881c86924b SHA1 7e2602e90f3f6cce6991a91c4a6df097eded7417 SHA256 c6ca9bfc848b64f107ba79e19138d1574e63d8bd00f426d430abda3188886fa2
-DIST gmerlin-1.2.0.tar.gz 3119224 RMD160 0fb21ff85be646493d0aa962d2174c4766e439d3 SHA1 a933eeda62a5ee05121292a9753a3772b48bea1b SHA256 80a217c417b197562961cfd55bf5d356d7eb5278601f6f5e05636455822e3d62
-EBUILD gmerlin-0.3.8.ebuild 2221 RMD160 d6f35fa8c967a978168c13c3df22dcaec1037444 SHA1 22c7951c3bbdfb5514744cb672fd27d8cb4b8b2c SHA256 a367f3d7c067f45f3a44a6d1192d0e3f6faab9955929e8ba87578420e6f9d705
-EBUILD gmerlin-1.2.0.ebuild 2218 RMD160 4141a423e28d697d3acb9151554888f6db9b6f6d SHA1 873ea35fcc981ed6f455e971840960de9c0ce608 SHA256 9759df6a0efd5340f0387097604cc97a73019b8fdd7564f9a8d059f556ca97b7
-MISC ChangeLog 561 RMD160 48e702a070c57da387c039292cd049d2521e2204 SHA1 50cc03f24cd0279511d55112c71e9eaec4b37b01 SHA256 54e53073619194027f84cda6d00a9630812702750325b66f3b3463553179b0d5
-MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
+AUX gmerlin-1.2.0-makefile-am.patch 585 SHA256 62c953dea5cae81c9141ad82f5b0c3cf18a6f2e17dd04760a6d6e605a678688e SHA512 19110f6185a7a7045f6a27adfa5f55fdb9b66d0f3d19878d68e79576e2781b66b0b1a4a8f9f45d306e3a0d42118c405fa3240b2aed678ce6523c50fcad7e0f65 WHIRLPOOL 4cbeba2e749d4b4ef74e2ee25d745c0753dea59057c200be7918f057677034b7e20ac417388a48a00a15d036908c22c0bf1fb1de67ca7565f7ecee127da68880
+AUX gmerlin-cflags.patch 354 SHA256 bb6fe86a057fb4c18b80825b11d259535ef1051e95fee7e3a1582b05d23d946e SHA512 d74df79865ae709e9ca53999580c3e7ee96736f7b19e87295b26fe5cc4bb096d08e2a223d3e4183f2975cb9b70d1d2503145846063ebb1888821cbd3faecfa81 WHIRLPOOL bbd29dce30d53e71bd3ef72cf4ecdb0352fc8b01c7dac333a4dcec38c237beb52adb7e907b40467edb668f8f87d99a39d8c32211ddd16069957fdc99038bd69f
+DIST gmerlin-1.2.0.tar.gz 3119224 SHA256 80a217c417b197562961cfd55bf5d356d7eb5278601f6f5e05636455822e3d62 SHA512 9c7e5377f6fc29d201d1cad8adfc20e184a39b66028640460e9b021b6baee7a7146bd1a1e8a91dca2879d7c979c9b1cdaf9e07e421af090848d3bedcd58e090d WHIRLPOOL d8cb289af6f53d700d88c885f66be106bba1a2961c0801da2b91fbde96dc0cfa6ae85e35daca73c3fb0444e8b534b97a4fff1c5210a19979934a5112b6418098
+EBUILD gmerlin-1.2.0.ebuild 1976 SHA256 cb0a10f696103eae9d4fa798e74b54571776417bdef3dafd83780462b01a1bb6 SHA512 85a55edf55b5f4c0350bbbfa3b3519fad3451fbf6215c114f5af450eb3daf01f851dde440ab3d49962f3cad1bf76e107cb68fff3609664cee8b99f8fc56a5bec WHIRLPOOL 13dc463f591763a2b48e069d2c003aa3c3344432f30f601854885e4fda4df6c62efa13defdc786214905a5dc82d3139ad5fc5a725f73081aa73c2537d9153dfa
+MISC ChangeLog 855 SHA256 b53a4244369cf83388b11df6c5fc92064b645ee7e583967204b5529b6bedb465 SHA512 4640ed8bd948cb9b32c4efcd5a200c6ce5a9caedb427c7781a70bf007505dba78595123f187de94c33ac606bbf21547bfeb2b69a2920576eb87db053a4b91004 WHIRLPOOL 1a9d9553968c037d94b6c591df61b699249de567f87f0e96c7bf1aad4d30d431d89ca485a8566038aca8377919e230164d63b1e6dc7b62060c8a74aefc3315d5
+MISC metadata.xml 431 SHA256 ac68f2e7ce7274995aec1f0fd73d176703d8462301733388121f52c015a11fe4 SHA512 70c337b009fe5d641a83e1ec819a960a81f1e83a912ea443b26a653a68afc238c6768b50123b56e38cb390b641cb3dae5e282346178f65c5d208ec5af0342b2f WHIRLPOOL cbea812f31145ff49aef03329e4558cdef42f4c92acfb613af7edea7ba3fc19c6db654fb650a7c29804baee462ceb558d9cb9b3ab010dd0ad772db80916db38c

Added: trunk/overlays/proaudio/media-libs/gmerlin/files/gmerlin-1.2.0-makefile-am.patch
===================================================================
--- trunk/overlays/proaudio/media-libs/gmerlin/files/gmerlin-1.2.0-makefile-am.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-libs/gmerlin/files/gmerlin-1.2.0-makefile-am.patch	2013-03-29 00:37:14 UTC (rev 2602)
@@ -0,0 +1,16 @@
+# A patch created by lilrc to avoid unecessary and possibly faulty
+# linking.
+
+--- gmerlin-1.2.0.orig/doc/Makefile.am	2012-06-08 13:50:30.000000000 +0200
++++ gmerlin-1.2.0/doc/Makefile.am	2013-03-29 01:21:49.513906578 +0100
+@@ -22,10 +22,8 @@
+ gmerlin_TEXINFOS= $(info_TEXINFOS) version.texi
+ 
+ userguide: $(gmerlin_TEXINFOS)
+-	ln -sf `pwd`"/$(top_srcdir)/doc/img" $(top_builddir)/img
+ 	$(MAKEINFO) -I $(top_srcdir)/doc $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+                 --html -o userguide $(top_srcdir)/doc/gmerlin.texi
+-	rm -f $(top_builddir)/img
+ 
+ apiref:
+ 	doxygen Doxyfile

Deleted: trunk/overlays/proaudio/media-libs/gmerlin/gmerlin-0.3.8.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/gmerlin/gmerlin-0.3.8.ebuild	2013-03-28 21:20:26 UTC (rev 2601)
+++ trunk/overlays/proaudio/media-libs/gmerlin/gmerlin-0.3.8.ebuild	2013-03-29 00:37:14 UTC (rev 2602)
@@ -1,84 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit autotools eutils
-
-DESCRIPTION="Gmerlin A/V decoder library"
-HOMEPAGE="http://gmerlin.sourceforge.net/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="alsa cddb cdio doc debug esd jpeg libvisual mjpeg musicbrainz nls oss png
-pulseaudio quicktime tiff utils v4l"
-
-DEPEND=">=dev-libs/libxml2-2.4.0
-		>=media-libs/gavl-0.2.7
-		>=media-libs/fontconfig-2.2.3
-		>=media-libs/freetype-2
-		>=x11-libs/gtk+-2.8.0
-		virtual/opengl
-		alsa? ( >=media-libs/alsa-lib-1.0.0 )
-		cddb? ( >=media-libs/libcddb-1.0.2 )
-		cdio? ( >=dev-libs/libcdio-0.76 )
-		doc? ( app-doc/doxygen )
-		esd? ( >=media-sound/esound-0.2.19 )
-		jpeg? ( media-libs/jpeg )
-		libvisual? ( >=media-libs/libvisual-0.4.0 )
-		mjpeg? ( media-video/mjpegtools )
-		musicbrainz? ( >=media-libs/musicbrainz-2.0.2 )
-		png? ( media-libs/libpng )
-		pulseaudio? ( media-sound/pulseaudio )
-		quicktime? ( >=media-libs/libquicktime-1.0.3 )
-		tiff? ( media-libs/tiff )
-		"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-cflags.patch
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		--without-cpuflags \
-		--disable-dependency-tracking \
-		--docdir=/usr/share/doc/${PF}/html \
-		$(use_enable alsa) \
-		$(use_enable cddb) \
-		$(use_enable cdio libcdio) \
-		$(use_enable debug) \
-		$(use_with doc doxygen) \
-		$(use_with doc texinfo) \
-		$(use_enable esd) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable libvisual) \
-		$(use_enable mjpeg mjpegtools) \
-		$(use_enable musicbrainz) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable png libpng) \
-		$(use_enable pulseaudio) \
-		$(use_enable quicktime lqt) \
-		$(use_enable tiff libtiff) \
-		$(use_enable v4l) \
-		$(use_enable utils camelot) \
-		$(use_enable utils plugincfg) \
-		$(use_enable utils alsamixer) \
-		$(use_enable utils player) \
-		$(use_enable utils kbd) \
-		$(use_enable utils transcoder) \
-		$(use_enable utils visualizer) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS NEWS README INSTALL
-}

Modified: trunk/overlays/proaudio/media-libs/gmerlin/gmerlin-1.2.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/gmerlin/gmerlin-1.2.0.ebuild	2013-03-28 21:20:26 UTC (rev 2601)
+++ trunk/overlays/proaudio/media-libs/gmerlin/gmerlin-1.2.0.ebuild	2013-03-29 00:37:14 UTC (rev 2602)
@@ -1,20 +1,22 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit autotools eutils
+EAPI="5"
 
+inherit autotools-utils exteutils
+
 DESCRIPTION="Gmerlin A/V decoder library"
 HOMEPAGE="http://gmerlin.sourceforge.net/";
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="alsa cddb cdio doc debug esd jpeg libvisual mjpeg musicbrainz nls oss png
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa cddb cdio doc debug jpeg libvisual musicbrainz nls oss png
 pulseaudio quicktime tiff utils v4l"
 
-DEPEND=">=dev-libs/libxml2-2.4.0
+RDEPEND=">=dev-libs/libxml2-2.4.0
 		>=media-libs/gavl-1.4.0
 		>=media-libs/fontconfig-2.2.3
 		>=media-libs/freetype-2
@@ -23,62 +25,53 @@
 		alsa? ( >=media-libs/alsa-lib-1.0.0 )
 		cddb? ( >=media-libs/libcddb-1.0.2 )
 		cdio? ( >=dev-libs/libcdio-0.76 )
-		doc? ( app-doc/doxygen )
-		esd? ( >=media-sound/esound-0.2.19 )
 		jpeg? ( virtual/jpeg )
 		libvisual? ( >=media-libs/libvisual-0.4.0 )
-		mjpeg? ( media-video/mjpegtools )
 		musicbrainz? ( >=media-libs/musicbrainz-2.0.2 )
 		png? ( media-libs/libpng )
 		pulseaudio? ( media-sound/pulseaudio )
 		quicktime? ( >=media-libs/libquicktime-1.0.3 )
-		tiff? ( media-libs/tiff )
-		"
-RDEPEND="${DEPEND}"
+		tiff? ( media-libs/tiff )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+PATCHES=(
+	"${FILESDIR}/${PN}-cflags.patch"
+	"${FILESDIR}/${P}-makefile-am.patch"
+)
+AUTOTOOLS_AUTORECONF="1"
 
-	epatch "${FILESDIR}"/${PN}-cflags.patch
-	eautoreconf
+src_prepare() {
+	esed_check -i -e "s:../img/:${S}/doc/img/:" "${S}/doc/${PN}.texi"
+	autotools-utils_src_prepare
 }
 
-src_compile() {
-	econf \
-		--without-cpuflags \
-		--disable-dependency-tracking \
-		--docdir=/usr/share/doc/${PF}/html \
-		$(use_enable alsa) \
-		$(use_enable cddb) \
-		$(use_enable cdio libcdio) \
-		$(use_enable debug) \
-		$(use_with doc doxygen) \
-		$(use_with doc texinfo) \
-		$(use_enable esd) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable libvisual) \
-		$(use_enable mjpeg mjpegtools) \
-		$(use_enable musicbrainz) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable png libpng) \
-		$(use_enable pulseaudio) \
-		$(use_enable quicktime lqt) \
-		$(use_enable tiff libtiff) \
-		$(use_enable v4l) \
-		$(use_enable utils camelot) \
-		$(use_enable utils plugincfg) \
-		$(use_enable utils alsamixer) \
-		$(use_enable utils player) \
-		$(use_enable utils kbd) \
-		$(use_enable utils transcoder) \
-		$(use_enable utils visualizer) \
-		|| die "econf failed"
-	emake || die "emake failed"
+src_configure() {
+	local myeconfargs=(
+		$(use_enable alsa)
+		$(use_enable cddb)
+		$(use_enable cdio libcdio)
+		$(use_enable debug)
+		$(use_with doc doxygen)
+		$(use_enable jpeg libjpeg)
+		$(use_enable libvisual)
+		$(use_enable musicbrainz)
+		$(use_enable nls)
+		$(use_enable oss)
+		$(use_enable png libpng)
+		$(use_enable pulseaudio)
+		$(use_enable quicktime lqt)
+		$(use_enable tiff libtiff)
+		$(use_enable v4l)
+		$(use_enable utils plugincfg)
+		$(use_enable utils alsamixer)
+		$(use_enable utils player)
+		$(use_enable utils kbd)
+		$(use_enable utils transcoder)
+		$(use_enable utils visualizer)
+		--disable-esd
+		--without-cpuflags
+		--disable-dependency-tracking
+	)
+	autotools-utils_src_configure
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS NEWS README INSTALL
-}

Modified: trunk/overlays/proaudio/media-libs/gmerlin/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-libs/gmerlin/metadata.xml	2013-03-28 21:20:26 UTC (rev 2601)
+++ trunk/overlays/proaudio/media-libs/gmerlin/metadata.xml	2013-03-29 00:37:14 UTC (rev 2602)
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-	<herd>no-herd</herd>
 	<maintainer>
 		<email>proaudio@xxxxxxxxxxxxx</email>
 		<name>pro-audio overlay team</name>
 	</maintainer>
+	<use>
+		<flag name="cdio">CDIO support through <pkg>dev-libs/libcdio</pkg></flag>
+		<flag name="libvisual">Libvisual support</flag>
+		<flag name="utils">Build utilities</flag>
+	</use>
 </pkgmetadata>