oss: Version bump

(Portage version: 2.2.0_alpha120/git/Linux x86_64, signed Manifest commit with key 84F20B43)

6 files changed, 18 insertions, 140 deletions

diff --git a/media-sound/oss/Manifest b/media-sound/oss/Manifest
index 81a7722..5d38ba0 100644
--- a/media-sound/oss/Manifest
+++ b/media-sound/oss/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX oss-4.2.2004-as-needed-strip.patch 2597 RMD160 4948e06fa2f42b7e9d7272a3f293c02693150bb5 SHA1 30eae3caaadadf17d50236d60e5692c25544900f SHA256 1dbe483d08ba25380791f9637b6c95235f71091fd1480580979d72ca4e9c2b6e
-AUX oss-4.2.2004-filesystem-layout.patch 6703 RMD160 fee44548032c6fd88ddff2a90e514b997918d797 SHA1 33aae9b12ca5cd0bd34beb105ed8ed77da2c207f SHA256 552b5ffc08dfa8bda20d12febcfcf9e66919dec6fb4f21c88e64415b1488c81d
-AUX oss-4.2.2004-txt2man.patch 340 RMD160 9211cd9f851843f1354ee6a8eddfab2fe04e3409 SHA1 df56f9001f11a0cb3552c37212ba7732e9640f08 SHA256 66b3895c68a58d419c004240fb915539c32e73f199fc36dcbfd9aa71f4dde28f
-AUX oss.conf 103 RMD160 aa2bb42cfd9137ab7cdf546267dca9dd1f3448dd SHA1 61ff7da9e8d87680d71651beb93b16a7b0fbcd9e SHA256 d135e1b36855e9c6ef1c110150b91df16cc1fe31e08ebec8bdaa5bb7dc95699f
-AUX oss.init 344 RMD160 7a90f308376ed44f8f5074ff5febe93977eec862 SHA1 d1b869f10343670fb2f93260c487533778da46ce SHA256 28f72cd8208211e41f2bfa60556157a45f2bc685ce6c13568be3f20b0f5466f5
-DIST oss-v4.2-build2004-src-gpl.tar.bz2 1790085 RMD160 7b62cb96bf363d1c0a4018e21b0737ec5ee3c5b5 SHA1 75c3ff1cf3e3bd5b351b1f778100387f998c7f3a SHA256 6a4ac364c6ed022467b23a9db137857afa9f8e9706a4bdbcb85b98efcde3f4a0
-DIST oss-v4.2-build2005-src-gpl.tar.bz2 1790056 RMD160 d70d85b407f66c8e884996d9bbefc5a4e3f84f06 SHA1 7924d8893f3af94c5c73c651ae0a6d5073a94bae SHA256 41c493eda1c1b93787085f36f8e68630af6112523216f3664ca1da8b7ece9bca
-EBUILD oss-4.2.2004.ebuild 2636 RMD160 a6a43448701fe908dabb9bdf4311d700b1d3eb29 SHA1 69acf8f09decfaff64adcbc4ec0e26a764ee49e9 SHA256 c4838d3d1316610aeb135da5e595d281ebd281bb3c07a2ed53e233002dd84b5b
-EBUILD oss-4.2.2005.ebuild 2666 RMD160 9a2fa218d4860498db2ee1fa118626d59daf278e SHA1 83975cc1cdfa18931407c85f12adb03129ac6f25 SHA256 e124709ae11dba74904d2a9960bed45bdb3b543418821f027b18e28fefc7fbed
-MISC metadata.xml 205 RMD160 107c06020a486b352e3a1fe310af323a5764bc2a SHA1 91c73725685fb8fb5a9630275f17ec106d2c3cfd SHA256 370b4bb14b4fa4b9e8d4eb74d51d653f12f1c7c3e210282a886ae871304f0769
+AUX oss-4.2.2006-as-needed-strip.patch 2597 SHA256 5b344eddb32d08cd6aea7778cd0482c9a8b0244671c872265c69db5d1793af64 SHA512 f7ae55a65a1d52f6d1e2a8f36313bb0311481f57357faabc737342679dd60c3d25e4471e42e1f19c0e100735a7177a88ff89f6c18f2e226a88c2dd30e100d491 WHIRLPOOL 4a9ed230b0a2e9862b1ea3192938122c9383413d3bdf0b6b22722247443449523a3c8dc38fc40587ed75f88df948d5c0a9b9f8091f969434f2e974fd17ed7fa1
+AUX oss-4.2.2006-filesystem-layout.patch 6703 SHA256 552b5ffc08dfa8bda20d12febcfcf9e66919dec6fb4f21c88e64415b1488c81d SHA512 014dbb99f56361f88f6705ae885fc87faa59f6384b89cc045edf9e3c6c52203fc0d3e3a2fce1e89b4005d3c57a107f315c5aaf66fdba7fe13fdb18a8e2a0b1d7 WHIRLPOOL 8e2209635427b27f5ce6d15028ed85c35f402dbc1711d469ecf914b26b42849a75a9c51c4c5c8dd919002643a2e3fa19e2bf59e638269459605c7b5a4d3ed452
+AUX oss-4.2.2006-txt2man.patch 340 SHA256 66b3895c68a58d419c004240fb915539c32e73f199fc36dcbfd9aa71f4dde28f SHA512 540a9e75e3f6b7c60aa37468fe09111fdeb63f6d569878a02ead8c7ea468bfeae42c820c163e2585a860095fa2753c1f90dd5bf856b94d248449a90987fed577 WHIRLPOOL 546c1ab7f81a88bf7e910efc762b165638253de1fea708430b910508f68b6fee61ff6b6b5dd2ef1611caadd0d73ca17fa330f184abc9f39cda1b380ba9ec6196
+AUX oss.conf 103 SHA256 d135e1b36855e9c6ef1c110150b91df16cc1fe31e08ebec8bdaa5bb7dc95699f SHA512 0f65912d7a802a300182f635a6fc98f02045a4a776050980a01e887d88d01d37f4a325d7a314a01e4b8a8f14603e10f766c4716dcd4a7f090d0f3f2e5e3db6eb WHIRLPOOL 0da9282cde53f8356d35856b212e184fbe96465872c3b0de3ac2490419ed5da045c72dd640c2c6ba4cec72112e816b090ebbebefbe94aa67e9ea7896f706f4ca
+AUX oss.init 344 SHA256 28f72cd8208211e41f2bfa60556157a45f2bc685ce6c13568be3f20b0f5466f5 SHA512 a64bf71fa7bb654bef81cd2f4cfc7d5421ecc376c1befa2ed80a157140fd9e7ed6b581acfc8d3e809dfc82e0dee2375539acd3c9adfcad78ba35e8249b90e265 WHIRLPOOL 9d2c8019b6d4ec9e844befbd166aba56e5308b45dd6e011ce5a84d27afa78f1b6b84fac4068025cfd329be5c4946c9d2f3f3a74a1815230a144e1b6d862bce18
+DIST oss-v4.2-build2006-src-gpl.tar.bz2 1767324 SHA256 1d034bd0ab967d1d4e848b79171a36cf75656f87c542ea96ce4629ca69995391 SHA512 d1834055e446496bd215a520a18af8a86f0109eab19e3fa2a6a67a8cb0958d9ec7fe343a2515bfc84e9a697308fb93dc8d50bdd0dbe73f2aa9717ec0e3d6e4a6 WHIRLPOOL a5253d26bf72b104f01750a6115656ba237b1dafbe2ab096b66eb9837008af97b728c1df034ecda132b04d73b4e3707b542eb7d2a95474215da04b27d4cd3336
+EBUILD oss-4.2.2006.ebuild 2636 SHA256 33076dfc8e923cd18d44a6383560451236c5376db8ac1b60ef243e1b6bf289d6 SHA512 5bce5f491a0c95ae2724fcbc61fec07213aa45a250f47408d7a87f5c6c26927238657f376cf50a5f0945989766cc7cb7e070eaae968530db85a1dd0023c6bc94 WHIRLPOOL 6e841273d3cc87288babc10a99d0332eb732871d34309043d3ee4e69c05f9b5ee187f6ba8ad49b50a9debe2a2504883d735e76de71e4ccf00d85e18ab958669f
+MISC metadata.xml 205 SHA256 370b4bb14b4fa4b9e8d4eb74d51d653f12f1c7c3e210282a886ae871304f0769 SHA512 3ae6a16639d8ac011e7e2018190926eada9af76a7399fbd2e080941a932dc90f34880a566644abdc54d4ec581b807047dd551de8ecad541487963a84647cfeaa WHIRLPOOL b8deb16b47263b3a01963aef07d016253997bdae3cffddfaf73f832811c769e3550854460b4293cf176a365c7c40106dd13e30f764838f24c1046bad364718b8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk7t7OIACgkQmWq1bYTyC0MWaQEAq6GBwRjaDem3zl0p4B/Tl2xr
-xeIjdVkiP1HFrLYueEoA/2D4/u34CSJnoaNPxse2TuqIfgj50gM5u48qltx4AaT3
-=vIDy
+iF4EAREIAAYFAlAJQT0ACgkQmWq1bYTyC0PhBwEAqA/xwGJUSF8J/OMddF19NuDG
+N0Z2Pth93HKpJ0C8OwYA/0pl83+KglqJ53Pycu660nsBb66z4ZflAU5vKNv/5bO7
+=HhLo
 -----END PGP SIGNATURE-----
diff --git a/media-sound/oss/files/oss-4.2.2004-as-needed-strip.patch b/media-sound/oss/files/oss-4.2.2006-as-needed-strip.patch
index 211028c..afff068 100644
--- a/media-sound/oss/files/oss-4.2.2004-as-needed-strip.patch
+++ b/media-sound/oss/files/oss-4.2.2006-as-needed-strip.patch
@@ -24,7 +24,7 @@ index 5f8216b..863ba7f 100644
  install:	libsalsa.la
  		$(LIBTOOL) cp libsalsa.la /usr/lib
 diff --git a/setup/srcconf.c b/setup/srcconf.c
-index 241c590..85bac58 100644
+index 0d37a16..6e20d54 100644
 --- a/setup/srcconf.c
 +++ b/setup/srcconf.c
 @@ -928,7 +928,7 @@ printf("Symlink %s -> %s\n", source, target);
@@ -40,8 +40,8 @@ index 241c590..85bac58 100644
  
        fprintf (f, "$(BINDIR)/%s:\t$(OBJECTS)\n", name);
        fprintf (f,
--	       "\t$(CC) $(CFLAGS) $(LIBRARIES) $(LDFLAGS) -s -o $(BINDIR)/%s $(OBJECTS) %s\n",
-+	       "\t$(CC) $(CFLAGS) -o $(BINDIR)/%s $(OBJECTS) %s $(LIBRARIES) $(LDFLAGS)\n",
+-	       "\t$(CC) $(CFLAGS) -s -o $(BINDIR)/%s $(OBJECTS) $(LIBRARIES) $(LDFLAGS) %s\n",
++	       "\t$(CC) $(CFLAGS) -o $(BINDIR)/%s $(OBJECTS) $(LIBRARIES) $(LDFLAGS) %s\n",
  	       name, extra_libraries);
        fprintf (f, "\n\n");
      }
@@ -49,8 +49,8 @@ index 241c590..85bac58 100644
  
        fprintf (f, "$(SBINDIR)/%s:\t$(OBJECTS)\n", name);
        fprintf (f,
--	       "\t$(CC) $(CFLAGS) $(LIBRARIES) $(LDFLAGS) -s -o $(SBINDIR)/%s $(OBJECTS) %s\n",
-+	       "\t$(CC) $(CFLAGS) -o $(SBINDIR)/%s $(OBJECTS) %s $(LIBRARIES) $(LDFLAGS)\n",
+-	       "\t$(CC) $(CFLAGS) -s -o $(SBINDIR)/%s $(OBJECTS) $(LIBRARIES) $(LDFLAGS) %s\n",
++	       "\t$(CC) $(CFLAGS) -o $(SBINDIR)/%s $(OBJECTS) $(LIBRARIES) $(LDFLAGS) %s\n",
  	       name, extra_libraries);
        fprintf (f, "\n\n");
      }
diff --git a/media-sound/oss/files/oss-4.2.2004-filesystem-layout.patch b/media-sound/oss/files/oss-4.2.2006-filesystem-layout.patch
index cc5c8a8..cc5c8a8 100644
--- a/media-sound/oss/files/oss-4.2.2004-filesystem-layout.patch
+++ b/media-sound/oss/files/oss-4.2.2006-filesystem-layout.patch
diff --git a/media-sound/oss/files/oss-4.2.2004-txt2man.patch b/media-sound/oss/files/oss-4.2.2006-txt2man.patch
index cb4022c..cb4022c 100644
--- a/media-sound/oss/files/oss-4.2.2004-txt2man.patch
+++ b/media-sound/oss/files/oss-4.2.2006-txt2man.patch
diff --git a/media-sound/oss/oss-4.2.2005.ebuild b/media-sound/oss/oss-4.2.2005.ebuild
deleted file mode 100644
index 9a05294..0000000
--- a/media-sound/oss/oss-4.2.2005.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit eutils flag-o-matic toolchain-funcs versionator
-
-MY_PV=$(get_version_component_range 1-2)
-BUILD=$(get_version_component_range 3)
-MY_P=${PN}-v${MY_PV}-build${BUILD}-src-gpl
-
-DESCRIPTION="Open Sound System - applications and man pages"
-HOMEPAGE="http://developer.opensound.com/"
-SRC_URI="http://www.4front-tech.com/developer/sources/stable/gpl/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk salsa"
-
-RDEPEND="media-sound/oss-driver
-	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	app-text/txt2man"
-
-S=${WORKDIR}/${MY_P}
-BUILD_DIR=${WORKDIR}/${PN}-build
-
-### TODO ###
-# - fix linking order for --as-needed
-# - fix man pages (savemixer installed twice)
-
-src_prepare() {
-	# the build system forces shadow builds
-	mkdir "${BUILD_DIR}"
-	epatch "${FILESDIR}"/${PN}-4.2.2004-filesystem-layout.patch \
-		"${FILESDIR}"/${PN}-4.2.2004-txt2man.patch \
-		"${FILESDIR}"/${PN}-4.2.2004-as-needed-strip.patch
-	sed -e "s:GRC_MAX_QUALITY=3:GRC_MAX_QUALITY=6:" -i configure || die
-}
-
-src_configure() {
-	cd "${BUILD_DIR}"
-
-	local myconf=""
-
-	use salsa || myconf="--enable-libsalsa=NO"
-
-	HOSTCC=$(tc-getCC) \
-	NO_WARNING_CHECKS=1 \
-	"${S}"/configure \
-		--config-midi=YES \
-		${myconf} || die
-}
-
-src_compile() {
-	cd "${BUILD_DIR}"
-
-	pushd lib
-	einfo "Building libraries"
-	emake CC=$(tc-getCC)
-	popd
-
-	pushd cmd
-	if ! use gtk; then
-		# remove ossxmix from SUBDIRS
-		sed -e "s:ossxmix::" -i Makefile
-	fi
-
-	einfo "Building applications"
-	emake CC=$(tc-getCC)
-	popd
-
-	pushd os_cmd/Linux
-	einfo "Building ossdetect/ossvermagic"
-	emake CC=$(tc-getCC)
-	popd
-}
-
-src_install() {
-	cd "${BUILD_DIR}"
-	use salsa && dolib lib/libsalsa/.libs/libsalsa.so*
-
-	dolib lib/libOSSlib/libOSSlib.so
-
-	# linux-headers ships OSS3 API
-	#insinto /usr/include/linux
-	#doins include/soundcard.h
-
-	# install man pages
-	use gtk || rm cmd/ossxmix/ossxmix.man
-	rename man 1 cmd/*/*.man
-	doman cmd/*/*.1
-	rename .man .7 misc/man7/*.man
-	doman misc/man7/*.7
-	rename man 7 kernel/drv/*/*.man
-	doman kernel/drv/*/*.7
-	newman os_cmd/Linux/ossdetect/ossdetect.man ossdetect.8
-	newman noregparm/cmd/ossdevlinks/ossdevlinks.man ossdevlinks.8
-	newman noregparm/cmd/savemixer/savemixer.man savemixer.8
-	newman noregparm/cmd/vmixctl/vmixctl.man vmixctl.8
-
-	insinto /etc/oss4
-	doins devices.list
-	newins .version version.dat
-	cat > "${ED}"/etc/oss.conf << EOF
-OSSETCDIR=/etc/oss4
-OSSVARDIR=/var/lib/oss4
-EOF
-
-	cd "target"
-	dosbin sbin/*
-	dobin bin/*
-	dolib lib/*
-
-	dodir /var/lib/oss4
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
-}
diff --git a/media-sound/oss/oss-4.2.2004.ebuild b/media-sound/oss/oss-4.2.2006.ebuild
index 7c82307..a7c4d47 100644
--- a/media-sound/oss/oss-4.2.2004.ebuild
+++ b/media-sound/oss/oss-4.2.2006.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $