Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 16 insertions, 111 deletions

diff --git a/media-sound/aumix/ChangeLog b/media-sound/aumix/ChangeLog
index 4f40a0de2cb9..cd268f20cdd8 100644
--- a/media-sound/aumix/ChangeLog
+++ b/media-sound/aumix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/aumix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/ChangeLog,v 1.67 2010/04/14 11:50:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/ChangeLog,v 1.68 2010/06/11 17:33:32 ssuominen Exp $
+
+*aumix-2.9.1 (11 Jun 2010)
+
+  11 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> +aumix-2.9.1.ebuild:
+  Version bump.
 
 *aumix-2.9 (14 Apr 2010)
 
diff --git a/media-sound/aumix/Manifest b/media-sound/aumix/Manifest
index 07bc1927e806..082bfcc9c00a 100644
--- a/media-sound/aumix/Manifest
+++ b/media-sound/aumix/Manifest
@@ -2,13 +2,11 @@ AUX aumix-2.8-close-dialogs.patch 613 RMD160 e06045a6aac2925d4578562d2133ea6a25a
 AUX aumix-2.8-mute.patch 470 RMD160 b1db29828cc06c02a94c0a8c88206f478b30d909 SHA1 34213e7973094b5b4fefa4f2f68a2913766cef04 SHA256 7b19f89a6b5ecb97181c1154c6ee21079ecc2ccfe25a5b3fb8fd670709a61a14
 AUX aumix-2.8-nls.patch 829 RMD160 bbc28e1285acdbadf0f3c58e18ab94f7160e6299 SHA1 dbe73b4599f5ef6834fd546ba795f83b92cb8453 SHA256 b0e2a27c422c6c106863521a7bd43741e74cfa86e490096da8209138c0a03b45
 AUX aumix-2.8-nohome.patch 529 RMD160 93ac976f5dd420ac63806e14fd3abc44d726f244 SHA1 449aaf90721769a806de94378cb943ffc3c5fa19 SHA256 fc0f6ee2a545f7340dc5a78fce6553132d274c607ec4473019f3c8ff62e598c7
-AUX aumix-2.8-noninter_strncpy.patch 1067 RMD160 7447539dc3028b68d3906090af7fb570b79349b5 SHA1 75687879f2ca9525e6a0faf8f6cb4013f9bd757e SHA256 e24130ba17b1d78446b45df7d3cc8f93195af4f12bd0943af542b4dd617e36f1
 AUX aumix-2.8-save_load.patch 1331 RMD160 5568874206654f06bce4a29a3039deee5760b45d SHA1 83b85df37e12f676143543c1b5c95c72455043dd SHA256 01adab9a3da9b1955b805bb2a47cc1cff8865625f6a726331f9911055d578e07
 AUX aumix.rc6 1143 RMD160 0db7127132b291eabbc7ebe178c6d862ccf8503c SHA1 62bce541e0f6c94f6be9f54db46675ec58d55f9b SHA256 571dc62080770e98c74390a5e7f6baa1187f6e8553b3528d623d5d577ed0eb27
 DIST aumix-2.8.tar.bz2 157503 RMD160 f7ab3737af772b97359dfc5d9852d06fda05aaa5 SHA1 5cea563ae91f628433a1950a36efd23681da4bf4 SHA256 636eef7f400c2f3df489c0d2fa21507e88692113561e75a40a26c52bc422d7fc
-DIST aumix-2.9.tar.bz2 167121 RMD160 bf1223a931e7559f2bea33093c59f830e936b99d SHA1 91b1ded7bceb4f6a1f9f780139210549513e5fd3 SHA256 5e4a4fbc28117637832abcde6eea1be609a82e1a96704c12cb21b68f97d73304
+DIST aumix-2.9.1.tar.bz2 231622 RMD160 a68d2e1da251edad721e997099d8149075f07449 SHA1 1b84054cfb74d3513b254d05c2fb08f6a6a3edc7 SHA256 d2ce43d532ef75072c8d4e7922e3bc06be6d97765a508d9ceb0d1766bbe70e29
 EBUILD aumix-2.8-r4.ebuild 1699 RMD160 2ce8d9e868b21810020eeda14a4b708a2ff01e1c SHA1 a693d2c534757b7ffa5679354b6243b9eb8199f8 SHA256 dfb0bf2622fa72fda8ff3588cbfd4aef33b9e8f1b2abc5556011d647bc5283c5
-EBUILD aumix-2.8-r5.ebuild 1564 RMD160 d6cb956e21d382e151ba667b9b4370b2dbf0f5d2 SHA1 0eb7e9dc8b7017e3554a0ad5a747d4bcb93dbde4 SHA256 b05a4af60a00bbd14b9665ff38be2d00f2774dbeea0972f1a980ec0407b13eb6
-EBUILD aumix-2.9.ebuild 1485 RMD160 d941ee3e3403dd0799763939be3862634cf0ce4e SHA1 669c9f5cec20b1b50c7db203a3a4f4517eeb3030 SHA256 929e7842bf463b39f4d182c2ed8538ee8b16c8852c1a93b078a66c1cadc435b0
-MISC ChangeLog 8232 RMD160 bbad377e36f1776ed17939b2e57108f7c04e52ef SHA1 579c1135c82b3b3f01a6bbc01351dd0bd6bfdf09 SHA256 9117793278a20ec11a9b076fad58685cffaab3abcee6528f46f88096d1caa215
+EBUILD aumix-2.9.1.ebuild 1120 RMD160 6603d928f06664c93822ff851557df505acc8039 SHA1 e9f7dd16f751185f09aad11644563cd7e44af8ff SHA256 f1aa94749a027c841e4ede4e506d993157c57a38aa11e9d91a7b9bad3c1a36b9
+MISC ChangeLog 8352 RMD160 5ca7b64ea4e98ec20bac463d0d15a265039f8070 SHA1 15ca12208daca5f81f43d8ba544186874e135b9b SHA256 f9d7a4b7114a0740885ed8b0056869ca6578b49ba4564eb8dc9de2002dfc0d7e
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/aumix/aumix-2.8-r5.ebuild b/media-sound/aumix/aumix-2.8-r5.ebuild
deleted file mode 100644
index 8960227ccc09..000000000000
--- a/media-sound/aumix/aumix-2.8-r5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/aumix-2.8-r5.ebuild,v 1.1 2009/05/12 11:43:57 ssuominen Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="Aumix volume/mixer control program"
-HOMEPAGE="http://jpj.net/~trevor/aumix.html"
-SRC_URI="http://jpj.net/~trevor/aumix/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="gpm gtk nls"
-
-RDEPEND=">=sys-libs/ncurses-5.2
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	gtk? ( >=x11-libs/gtk+-2:2 )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-nohome.patch \
-		"${FILESDIR}"/${P}-close-dialogs.patch \
-		"${FILESDIR}"/${P}-save_load.patch \
-		"${FILESDIR}"/${P}-nls.patch \
-		"${FILESDIR}"/${P}-mute.patch \
-		"${FILESDIR}"/${P}-noninter_strncpy.patch
-
-	# Prevent autotools from rerunning, bug #70379.
-	touch aclocal.m4 configure
-	find . -name Makefile.in -o -name stamp-h.in -print0 | xargs -0 touch;
-	touch configure
-}
-
-src_configure() {
-	local myconf="--without-gtk1"
-
-	use gtk || myconf="${myconf} --without-gtk"
-	use gpm || myconf="${myconf} --without-gpm"
-
-	econf \
-		$(use_enable nls) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
-
-	newinitd "${FILESDIR}"/aumix.rc6 aumix
-
-	if use gtk; then
-		doicon data/aumix.xpm
-		make_desktop_entry aumix Aumix aumix
-	fi
-}
diff --git a/media-sound/aumix/aumix-2.9.ebuild b/media-sound/aumix/aumix-2.9.1.ebuild
index cb19c797d4ef..7730049f21c1 100644
--- a/media-sound/aumix/aumix-2.9.ebuild
+++ b/media-sound/aumix/aumix-2.9.1.ebuild
@@ -1,39 +1,27 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/aumix-2.9.ebuild,v 1.1 2010/04/14 11:50:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/aumix-2.9.1.ebuild,v 1.1 2010/06/11 17:33:32 ssuominen Exp $
 
 EAPI=2
 inherit eutils
 
 DESCRIPTION="Aumix volume/mixer control program"
 HOMEPAGE="http://jpj.net/~trevor/aumix.html"
-SRC_URI="http://jpj.net/~trevor/aumix/${P}.tar.bz2"
+SRC_URI="http://jpj.net/~trevor/aumix/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="gpm gtk nls"
 
-RDEPEND=">=sys-libs/ncurses-5.2
-	gpm? ( >=sys-libs/gpm-1.19.3 )
+RDEPEND="sys-libs/ncurses
+	gpm? ( sys-libs/gpm )
 	gtk? ( x11-libs/gtk+:2 )
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
-	sys-apps/findutils
+	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-src_prepare() {
-	# 2.9 was released, none of this was applied. why?
-	epatch "${FILESDIR}"/${PN}-2.8-nohome.patch \
-		"${FILESDIR}"/${PN}-2.8-save_load.patch \
-		"${FILESDIR}"/${PN}-2.8-nls.patch \
-		"${FILESDIR}"/${PN}-2.8-mute.patch \
-		"${FILESDIR}"/${PN}-2.8-noninter_strncpy.patch
-
-	# Prevent autotools from rerunning, bug #70379.
-	find . -print0 |xargs -0 touch
-}
-
 src_configure() {
 	local myconf
 
@@ -42,7 +30,7 @@ src_configure() {
 
 	econf \
 		$(use_enable nls) \
-		--without-gtk1 \
+		--disable-dependency-tracking \
 		${myconf}
 }
 
@@ -54,6 +42,6 @@ src_install() {
 
 	if use gtk; then
 		doicon data/aumix.xpm
-		make_desktop_entry aumix Aumix aumix
+		make_desktop_entry aumix Aumix
 	fi
 }
diff --git a/media-sound/aumix/files/aumix-2.8-noninter_strncpy.patch b/media-sound/aumix/files/aumix-2.8-noninter_strncpy.patch
deleted file mode 100644
index 2c68873c29ae..000000000000
--- a/media-sound/aumix/files/aumix-2.8-noninter_strncpy.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
---- aumix-2.8.orig/src/common.c	2002-10-29 23:27:51.000000000 +0200
-+++ aumix-2.8/src/common.c	2009-05-12 14:36:08.000000000 +0300
-@@ -612,17 +612,18 @@
- int             SetShowNoninter(int dev)
- {
- /* Change or display settings from the command line. */
--	char           *devstr, dest;
-+	char           *devstr;
-+	char            dest[4];
- 	int             change = 0, tmp, left, right;
- 	/* Increase or decrease levels, optionally by a number. */
- 	if (!strncmp(optarg, "+", 1) || !strncmp(optarg, "-", 1)) {
- 		ErrorExitWarn(ReadLevel(dev, &tmp), 'e');
- 		right = tmp >> 8;	/* I'll take the high byte, */
- 		left = tmp & 0xFF;	/* and you take the low byte. */
--		strncpy(&dest, (optarg + 1), 3);
-+		strncpy(dest, (optarg + 1), 3);
- 		change = 1;	/* For compatibility with versions 1.15 to 1.17, assume one if no number was given. */
--		if (atoi(&dest))
--			change = atoi(&dest);
-+		if (atoi(dest))
-+			change = atoi(dest);
- 		if (*optarg == '+') {	/* increase */
- 			right += change;
- 			left += change;