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

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

5 files changed, 45 insertions, 61 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/Manifest b/media-sound/codecgraph/Manifest
index 3032a052b9c8..4701df045bc6 100644
--- a/media-sound/codecgraph/Manifest
+++ b/media-sound/codecgraph/Manifest
@@ -4,18 +4,17 @@ Hash: SHA1
 AUX 20080422-makefile-prefix.diff 223 RMD160 6ed0f1080adfe73d3fa875a6c66983c511993292 SHA1 303ef78f02c5f401683f1d2a083396c888b03dbf SHA256 e8c08c799223af9606f835afd9b8f3e1cd72d4d6baf27fbffe00c9b45c9a0bb4
 AUX 20080507-makefile-prefix.diff 223 RMD160 86a542890a3e63575368b68aa7f82b97f14a4832 SHA1 9e1e1a215b6ee356296ee6cb164d62157b991c02 SHA256 5ad9bda3541373dc68fc0027ffd6e8137e4543e8513f198401b812e4ba28b37c
 AUX 20090522-makefile-prefix.diff 659 RMD160 d7fcac36a33fec5b0aa402d93644e462e86a8750 SHA1 04e02a2fd7181ed8dd538ab81382bc23f9ef0a95 SHA256 937e029003a551cd4f5ec205fa7b13b49a3bd5473bf93dd35ebcb663c89738bc
-DIST codecgraph-20080422.tar.gz 49261 RMD160 5875eb66888c959dbe6439f2a385cac245d8b17f SHA1 ddd274625682fbbb8e550b3904405449fb682710 SHA256 076680a9035a26cc5adc3af176c11e10b3dcb6829a8a6f14c8eb2ba2d0576d32
-DIST codecgraph-20080507.tar.gz 49516 RMD160 6f352577f5b421ce2d872b9696c315f8205031ad SHA1 1b7b58c449917624b7cad49d6c5ade8cdd910fac SHA256 95dd39d5117a19c1a3ee401f8f4f1424808cbaeed3c99707cf193a5d1cc0e438
+AUX 20120114-makefile-prefix.diff 657 RMD160 88903d308675346ff6547dd35dc1a277e96157c7 SHA1 071ec784fe9134d209e9da66ff437c80fd90a17d SHA256 18d5a9ae120cbfd60f387039a0b8fcf99ad0d4ed90daec1aa6ecf7fc3308fcf7
 DIST codecgraph-20090522.tar.gz 66824 RMD160 abfc3f26292bc182e11a7273e870a0ce5193c676 SHA1 7cb430a817fcffdfaec0be0b2b24c3ad0c16b8d5 SHA256 6a5ccf0995c2eb971cf0289c946fc84ba122f3f5ef5d4f0cf1228e367e55c379
-EBUILD codecgraph-20080422.ebuild 802 RMD160 5141cfa225f3f2d9a8c2cc0a77cb798b86dcbb43 SHA1 eb6860a9f7791bd5920c747e7cf2461eaf584ec9 SHA256 479767d2c73dcf454b189c5dc4b9bfaba66165ebb747ceb10b562ce4c59c6aa8
-EBUILD codecgraph-20080507.ebuild 802 RMD160 8ccb31aaff98852335ff26a1258142992726c992 SHA1 8c181829772d3a3bbe56305b4d7feea3fb651291 SHA256 dac57b3358c3064ce542adb379ffbf2c44d4df355f4d66e7c3fc37330f4a3d86
+DIST codecgraph-20120114.tar.gz 94168 RMD160 aa89c23027b60770abc8caf442ee4c219e316596 SHA1 135a37b4ae09fb26fba140d3f18600ed50c406d7 SHA256 24dca78c6a8cf894385df304d29f348d48868000d5ffbd03bf12c5b4f9805106
 EBUILD codecgraph-20090522.ebuild 802 RMD160 5d95d8525dce0a51b4efb4dd638857599c6b35d5 SHA1 3c865485c96ad078d17d63a6faa96becc1dfa2c5 SHA256 c5cff784cb210959b9eb26a734ab459043505bc5c97ca943a80149a0a12af44e
-MISC ChangeLog 1089 RMD160 b626c58d95ef697a7faf1625be5e72ab7767120d SHA1 2619abcc1547f1a0c4d4f19e35f1b2c3bdf86241 SHA256 96633603497e0bc6fdd0a3b9f45663d46744bc1df2135b934cc02c6ac1b2d57c
+EBUILD codecgraph-20120114.ebuild 751 RMD160 c82667b2ef9894970aad7a8cc27fc5c02a55a758 SHA1 61d4134ff76499d67e9dd450d86bfbb197b4752d SHA256 c09bd995e53238d6ec37ada875e349c40205f8a245059fbc48823c8785d0ec5f
+MISC ChangeLog 1459 RMD160 fa7f300477d8308f505e80368383da847b995c79 SHA1 b1e97c8e23797b032eca5ad0dc4ba38380d3544c SHA256 8e53b58124c55b04ee443ae1914de06f42b218808a821eefa6d7cbcaf477e204
 MISC metadata.xml 248 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d SHA1 4ea80510c4e90c385ac851b4f82c36b4f91d9402 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAkzpIWAACgkQp5vW4rUFj5r2LQCdE6QxyxDfTkwtHXHzTZNq0cas
-+V0An0JFUTtxoCLMgiqM/eRN9xT8kObb
-=0pxO
+iEYEARECAAYFAk+RQMcACgkQp5vW4rUFj5pTFQCgqeKHg8794OEA1PgEjBaiMISC
+fUcAoL+voFVvhxX0QS+BbE9MENtTHhhb
+=6JI5
 -----END PGP SIGNATURE-----
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 \