Fix repoman issues, fix latest ebuild etc

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

6 files changed, 28 insertions, 148 deletions

diff --git a/media-sound/audiocompress/Manifest b/media-sound/audiocompress/Manifest
index c3829fa71ad7..366038507db5 100644
--- a/media-sound/audiocompress/Manifest
+++ b/media-sound/audiocompress/Manifest
@@ -1,22 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX audiocompress-1.5.1-gentoo.patch 983 RMD160 ad46e7b3560d1a1412f895749f4c71d4392e611d SHA1 ed5c165d25b8fac6cbbabc8c355b891d2e99b19e SHA256 c70a81351fd2465d6e8e63fd3ccd7425cc38f221f91ebef6732a6ffe48b9d444
 AUX audiocompress-1.5.2-esd.patch 439 RMD160 48e6c5d3f0dd398c29e525fb2a1ceba88b8874a0 SHA1 2799a7cc4c6a16df203ea2a6c5dc58c932efc18e SHA256 5f22c7a2e8550fdfe426d2e87a7b6a455cc9348e535f9d0a20753070e2579793
 AUX audiocompress-1.5.2-gentoo.patch 535 RMD160 5e2a2fbfb753420ad21359f1adb94c5ffac375f4 SHA1 0cd720518f28a212f37097123aaea874c32d607d SHA256 527eed1bc33992fa2ad453f501067610a83a0f3d0c31cc5d929b0dd44666ab5c
-DIST AudioCompress-1.5.1.tar.gz 38657 RMD160 4b9e29003948811d3d7b87a139d18f6c01ce115d SHA1 dabb8beb4d6d23991b46327ff8e226122dc75aba SHA256 83bb251794a751b92c95668a7f1ff346b682946eb33f916d989a8ad8a1f4a2c6
 DIST AudioCompress-1.5.2.tar.gz 25061 RMD160 e47093f2dbebd197b24d3cb592b9a9865c9c2d5a SHA1 d028f7fb81fecd8275e6a7de9b213c1f14a47b0b SHA256 52928e226968f45dc6f36bedaa34708835a8b0ba653335a3058be71cc8137191
 DIST AudioCompress-2.0.tar.gz 15752 RMD160 b72dce48478e4ac56741a42bc9fc2d9c5cae0ddb SHA1 49a2158cdca9c86a72f71d1afcbcc1f26a019da1 SHA256 90886ee8a996e720764f01e2640f11cd4bedda18a3aab5a95d298b6f69b789fc
-EBUILD audiocompress-1.5.1.ebuild 892 RMD160 90e72d48d84df1e7d5703d8d224c939432d996e2 SHA1 06a7059c63a59dbaa8cea0ddd77d53029f5c0172 SHA256 323d272d9d1828183ee700cb1682c42b9dda38f4704b5991585220a61ad840b5
-EBUILD audiocompress-1.5.2-r1.ebuild 955 RMD160 94f53689160864a3233cf880b2374698f880ebc9 SHA1 7cbbc48d85a6eba64aec712a0d0767fdb1ffc880 SHA256 f9ff2ca5f4daa6dea38e8a65e1223796ad5965244f633de4cb1ec13f04168749
-EBUILD audiocompress-1.5.2.ebuild 895 RMD160 4e426fdfa1ca4a3a3cb836cca6985b7e73ae032c SHA1 f8f94408fe051436f3fc6a2090fd7f60544244ca SHA256 18f7ff6243f8ed84764aeedfb1dbe00ce897b378be66c1c48eb56af6ece02ebd
-EBUILD audiocompress-2.0.ebuild 1014 RMD160 0d1359ca0dd863990ce5cc17412e5ab5de158d54 SHA1 2f772f4660497ba84bb1672a56ab265e24a892b6 SHA256 7431acc99f56b9b9ba5c6d6d3cefa8a9b44351f10d0f87eb84bdc58177f87123
+EBUILD audiocompress-1.5.2-r1.ebuild 833 RMD160 98753f6e0ac2f09d043a7b0fd9d25513a22e4d32 SHA1 c7305c7bb5243ca2b2be70f217ade57f3e0b7e49 SHA256 0f093b7c00c773058201d5aaaf23e515cc7f2d99bab1a4838f554edbdd98e23a
+EBUILD audiocompress-2.0.ebuild 786 RMD160 ebfd91486c8508665d218a702735ea6d26b9a792 SHA1 f744827e919bfbaa0dff396fd46534a72c0c0543 SHA256 a3712b879635daf8868c2ca157c8b4729be2d2f667b1cc95d1dc637c19edc561
 MISC ChangeLog 2901 RMD160 3bc57d78d95d53a32694e3922b53d76374984ef5 SHA1 986d91ee2fe57010f42fca4f80d5c034782ca13e SHA256 14d80ac565e953bad284df50a8e543e677d4f9c938680234e7f0e47c456019bb
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklLupsACgkQvFcC4BYPU0oyHgCdEEW3zXfXZkTaUTy0gnlQ2VUB
-51IAni0TqEloLfePOHddjWtFAaG6Is6g
-=GWJP
------END PGP SIGNATURE-----
diff --git a/media-sound/audiocompress/audiocompress-1.5.1.ebuild b/media-sound/audiocompress/audiocompress-1.5.1.ebuild
deleted file mode 100644
index 8e844b4baca2..000000000000
--- a/media-sound/audiocompress/audiocompress-1.5.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audiocompress/audiocompress-1.5.1.ebuild,v 1.9 2006/11/13 15:20:28 flameeyes Exp $
-
-IUSE=""
-
-inherit eutils
-
-MY_P="AudioCompress-${PV}"
-
-DESCRIPTION="Very gentle 1-band dynamic range compressor"
-HOMEPAGE="http://beesbuzz.biz/code/"
-SRC_URI="http://beesbuzz.biz/code/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-#-sparc: 1.5.5 - Gdk-ERROR **: BadValue (integer parameter out of range for operation) serial 7 error_code 2 request_code 1 minor_code 0
-KEYWORDS="~ppc -sparc x86"
-
-DEPEND="media-sound/esound"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	make clean
-
-	epatch ${FILESDIR}/${P}-gentoo.patch
-}
-
-src_compile() {
-	emake AudioCompress || die
-}
-
-src_install() {
-	dobin AudioCompress || die
-	dodoc ChangeLog README TODO
-}
diff --git a/media-sound/audiocompress/audiocompress-1.5.2-r1.ebuild b/media-sound/audiocompress/audiocompress-1.5.2-r1.ebuild
index 87a22ae94d08..d5e654e78e5c 100644
--- a/media-sound/audiocompress/audiocompress-1.5.2-r1.ebuild
+++ b/media-sound/audiocompress/audiocompress-1.5.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audiocompress/audiocompress-1.5.2-r1.ebuild,v 1.1 2007/03/09 04:23:51 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audiocompress/audiocompress-1.5.2-r1.ebuild,v 1.2 2009/06/01 18:18:03 ssuominen Exp $
 
 inherit eutils
 
@@ -11,28 +11,28 @@ HOMEPAGE="http://beesbuzz.biz/code/"
 SRC_URI="http://beesbuzz.biz/code/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-#-sparc: 1.5.5 - Gdk-ERROR **: BadValue (integer parameter out of range for operation) serial 7 error_code 2 request_code 1 minor_code 0
-KEYWORDS="~amd64 ~ppc -sparc x86"
+KEYWORDS="~amd64 ~ppc x86"
 
-DEPEND="esd? ( media-sound/esound )"
+RDEPEND=""
+DEPEND=""
 
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 
-	cd ${S}
-	make clean
+	emake clean
 
-	epatch ${FILESDIR}/${P}-gentoo.patch
-	use esd || epatch ${FILESDIR}/${P}-esd.patch
+	epatch "${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-esd.patch
 }
 
 src_compile() {
-	emake AudioCompress || die
+	emake AudioCompress || die "emake AudioCompress failed"
 }
 
 src_install() {
-	dobin AudioCompress || die
+	dobin AudioCompress || die "dobin failed"
 	dodoc ChangeLog README TODO
 }
diff --git a/media-sound/audiocompress/audiocompress-1.5.2.ebuild b/media-sound/audiocompress/audiocompress-1.5.2.ebuild
deleted file mode 100644
index fdb911db6fe6..000000000000
--- a/media-sound/audiocompress/audiocompress-1.5.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audiocompress/audiocompress-1.5.2.ebuild,v 1.3 2006/11/20 20:40:00 blubb Exp $
-
-IUSE=""
-
-inherit eutils
-
-MY_P="AudioCompress-${PV}"
-
-DESCRIPTION="Very gentle 1-band dynamic range compressor"
-HOMEPAGE="http://beesbuzz.biz/code/"
-SRC_URI="http://beesbuzz.biz/code/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-#-sparc: 1.5.5 - Gdk-ERROR **: BadValue (integer parameter out of range for operation) serial 7 error_code 2 request_code 1 minor_code 0
-KEYWORDS="~amd64 ~ppc -sparc x86"
-
-DEPEND="media-sound/esound"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	make clean
-
-	epatch ${FILESDIR}/${P}-gentoo.patch
-}
-
-src_compile() {
-	emake AudioCompress || die
-}
-
-src_install() {
-	dobin AudioCompress || die
-	dodoc ChangeLog README TODO
-}
diff --git a/media-sound/audiocompress/audiocompress-2.0.ebuild b/media-sound/audiocompress/audiocompress-2.0.ebuild
index b8483bd454b1..07c44f8fb96b 100644
--- a/media-sound/audiocompress/audiocompress-2.0.ebuild
+++ b/media-sound/audiocompress/audiocompress-2.0.ebuild
@@ -1,31 +1,34 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audiocompress/audiocompress-2.0.ebuild,v 1.1 2008/12/19 15:15:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audiocompress/audiocompress-2.0.ebuild,v 1.2 2009/06/01 18:18:03 ssuominen Exp $
 
-inherit toolchain-funcs flag-o-matic
+inherit toolchain-funcs
+
+MY_P=AudioCompress-${PV}
 
-MY_P="AudioCompress-${PV}"
 DESCRIPTION="Very gentle 1-band dynamic range compressor"
 HOMEPAGE="http://beesbuzz.biz/code/"
 SRC_URI="http://beesbuzz.biz/code/audiocompress/${MY_P}.tar.gz"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
-#-sparc: 1.5.5 - Gdk-ERROR **: BadValue (integer parameter out of range for operation) serial 7 error_code 2 request_code 1 minor_code 0
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="esd"
+IUSE=""
 
-DEPEND="esd? ( media-sound/esound )"
+RDEPEND=""
+DEPEND=""
 
 S=${WORKDIR}/${MY_P}
 
 src_compile() {
-	echo "AudioCompress: AudioCompress.o compress.o" > Makefile
-	use esd && append-flags "-DUSE_ESD `esd-config --cflags`"
-	tc-export CC
-	emake LDLIBS="$(use esd && echo `esd-config --libs`)" || die
+	emake \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" || die "emake failed"
 }
 
 src_install() {
-	dobin AudioCompress || die
+	dobin AudioCompress || die "dobin failed"
 	dodoc ChangeLog README TODO
 }
diff --git a/media-sound/audiocompress/files/audiocompress-1.5.1-gentoo.patch b/media-sound/audiocompress/files/audiocompress-1.5.1-gentoo.patch
deleted file mode 100644
index 24e510246296..000000000000
--- a/media-sound/audiocompress/files/audiocompress-1.5.1-gentoo.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur AudioCompress-1.5.1.orig/Makefile AudioCompress-1.5.1/Makefile
---- AudioCompress-1.5.1.orig/Makefile	2004-03-29 10:04:30.000000000 -0800
-+++ AudioCompress-1.5.1/Makefile	2004-08-02 12:57:48.347510623 -0700
-@@ -6,12 +6,12 @@
- 
- ### Different platforms need different options...
- ### Linux
--#DYNAMIC	=  -shared -Wl,-soname -Wl,$(@)
-+DYNAMIC	=  -shared -Wl,-soname -Wl,$(@)
- 
- ### MacOS X (Jaguar with Fink)
--CFLAGS	= -I/sw/include
--LDFLAGS	= -L/sw/lib
--DYNAMIC	= -dynamiclib
-+#CFLAGS	= -I/sw/include
-+#LDFLAGS	= -L/sw/lib
-+#DYNAMIC	= -dynamiclib
- 
- ### Comment out these lines if you don't have X11 installed or
- ### otherwise want to build it without X11
-@@ -22,7 +22,7 @@
- ### (or don't have the XMMS development headers installed)
- TARGETS += libcompress.so
- INSTALL += install-xmms
--CFLAGS	+= `xmms-config --cflags`
-+CFLAGS	+= `xmms-config --cflags` -fPIC
- LDFLAGS	+= `xmms-config --libs`
- 
- ### Comment out these lines if you don't want to include EsounD functionality