Version bump, incorporating ebuild improvements by Ian "idella4" Delaney that have been reviewed by Arfrever Frehtes Taifersar Arahesis in bug #313939.

(Portage version: 2.1.10.56/cvs/Linux x86_64)

4 files changed, 37 insertions, 52 deletions

diff --git a/media-sound/codecgraph/ChangeLog b/media-sound/codecgraph/ChangeLog
index 71c6c01ec079..c9f7b28eb17e 100644
--- a/media-sound/codecgraph/ChangeLog
+++ b/media-sound/codecgraph/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/codecgraph
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/codecgraph/ChangeLog,v 1.4 2010/11/21 13:40:34 chainsaw Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/codecgraph/ChangeLog,v 1.5 2012/04/20 10:55:52 chainsaw Exp $
+
+*codecgraph-20120114 (20 Apr 2012)
+
+  20 Apr 2012; Tony Vroon <chainsaw@gentoo.org>
+  +files/20120114-makefile-prefix.diff, -codecgraph-20080422.ebuild,
+  -codecgraph-20080507.ebuild, +codecgraph-20120114.ebuild:
+  Version bump, incorporating ebuild improvements by Ian "idella4" Delaney that
+  have been reviewed by Arfrever Frehtes Taifersar Arahesis in bug #313939.
 
 *codecgraph-20090522 (21 Nov 2010)
 
diff --git a/media-sound/codecgraph/codecgraph-20080507.ebuild b/media-sound/codecgraph/codecgraph-20080507.ebuild
deleted file mode 100644
index f8e2371d12f3..000000000000
--- a/media-sound/codecgraph/codecgraph-20080507.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/codecgraph/codecgraph-20080507.ebuild,v 1.1 2008/05/07 23:44:20 chainsaw Exp $
-
-inherit eutils
-
-DESCRIPTION="Generates a graph based on the ALSA description of an HD Audio codec."
-HOMEPAGE="http://helllabs.org/codecgraph/"
-SRC_URI="http://helllabs.org/codecgraph/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-lang/python
-	 media-gfx/graphviz"
-
-DEPEND="${RDEPEND}
-	media-gfx/imagemagick"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PV}-makefile-prefix.diff"
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc codecs.txt README BUGS IDEAS
-}
diff --git a/media-sound/codecgraph/codecgraph-20080422.ebuild b/media-sound/codecgraph/codecgraph-20120114.ebuild
index 83c3b525c588..3485e34f0656 100644
--- a/media-sound/codecgraph/codecgraph-20080422.ebuild
+++ b/media-sound/codecgraph/codecgraph-20120114.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/codecgraph/codecgraph-20080422.ebuild,v 1.1 2008/04/22 16:09:21 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/codecgraph/codecgraph-20120114.ebuild,v 1.1 2012/04/20 10:55:52 chainsaw Exp $
 
-inherit eutils
+EAPI=4
+
+inherit base python
 
 DESCRIPTION="Generates a graph based on the ALSA description of an HD Audio codec."
 HOMEPAGE="http://helllabs.org/codecgraph/"
@@ -12,23 +14,14 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND="dev-lang/python
-	 media-gfx/graphviz"
-
+RDEPEND="media-gfx/graphviz"
 DEPEND="${RDEPEND}
 	media-gfx/imagemagick"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PV}-makefile-prefix.diff"
-}
-
-src_compile() {
-	emake || die "make failed"
-}
+PATCHES=( "${FILESDIR}/${PV}-makefile-prefix.diff" )
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	make DESTDIR="${ED}" install || die
 	dodoc codecs.txt README BUGS IDEAS
+	python_convert_shebangs -r 2 "${ED}"
 }
diff --git a/media-sound/codecgraph/files/20120114-makefile-prefix.diff b/media-sound/codecgraph/files/20120114-makefile-prefix.diff
new file mode 100644
index 000000000000..2636fad59e57
--- /dev/null
+++ b/media-sound/codecgraph/files/20120114-makefile-prefix.diff
@@ -0,0 +1,18 @@
+diff -uNr codecgraph-20120114.ORIG/Makefile codecgraph-20120114/Makefile
+--- codecgraph-20120114.ORIG/Makefile	2012-04-20 11:46:16.585852026 +0100
++++ codecgraph-20120114/Makefile	2012-04-20 11:46:50.730851052 +0100
+@@ -1,4 +1,4 @@
+-PREFIX = /usr/local
++PREFIX = /usr
+ DOTTY = dot
+ 
+ samples = \
+@@ -87,7 +87,7 @@
+ install:
+ 	install -m755 -D codecgraph $(DESTDIR)$(PREFIX)/bin/codecgraph
+ 	install -m755 -D codecgraph.py $(DESTDIR)$(PREFIX)/bin/codecgraph.py
+-	install -m644 -D codecgraph.1 $(DESTDIR)$(PREFIX)/man/man1/codecgraph.1
++	install -m644 -D codecgraph.1 $(DESTDIR)$(PREFIX)/share/man/man1/codecgraph.1
+ 
+ thumbs: png
+ 	for p in $(pngfiles);do \