Adjust ebuild so that audioctl does not install when >=sys-kernel/linux-headers-2.6.0 are present.

Package-Manager: portage-2.1.2_pre1

4 files changed, 41 insertions, 27 deletions

diff --git a/sys-apps/sparc-utils/ChangeLog b/sys-apps/sparc-utils/ChangeLog
index bbf591413c41..44c69055ae83 100644
--- a/sys-apps/sparc-utils/ChangeLog
+++ b/sys-apps/sparc-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/sparc-utils
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sparc-utils/ChangeLog,v 1.21 2006/04/11 15:25:47 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sparc-utils/ChangeLog,v 1.22 2006/09/19 02:00:32 weeve Exp $
+
+  19 Sep 2006; Jason Wever <weeve@gentoo.org> sparc-utils-1.9-r3.ebuild:
+  Adjust ebuild so that audioctl does not install when
+  >=sys-kernel/linux-headers-2.6.0 are present.
 
 *sparc-utils-1.9-r3 (11 Apr 2006)
 
diff --git a/sys-apps/sparc-utils/Manifest b/sys-apps/sparc-utils/Manifest
index 80fb3679d107..f7d7f77d993d 100644
--- a/sys-apps/sparc-utils/Manifest
+++ b/sys-apps/sparc-utils/Manifest
@@ -1,25 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 abfe7de6263b01cbc74c54b73f108fc4 ChangeLog 2847
-RMD160 9cb8b3caa2c516e68f16cf2a4fea06a83dcded70 ChangeLog 2847
-SHA256 8c6bb79f8792de5b5474114216fdacdaa77ac429cd0456c73ecc22090e4a31f5 ChangeLog 2847
+AUX audioctl.init 571 RMD160 f2c37ee35ff9060b4d6184a26b16eca3e1bbfceb SHA1 b06059a24fdc96cc1bb605b21b25eaad572cc40f SHA256 76f0d64444986ef59fa936d5acc5082773a825b79c49ba18e7619f53a78fbde8
 MD5 90419bd873d8ef797f6ac6f982c3bcbf files/audioctl.init 571
 RMD160 f2c37ee35ff9060b4d6184a26b16eca3e1bbfceb files/audioctl.init 571
 SHA256 76f0d64444986ef59fa936d5acc5082773a825b79c49ba18e7619f53a78fbde8 files/audioctl.init 571
-MD5 7eef47ac63ca0a7e8a4fdace86893005 files/digest-sparc-utils-1.9-r3 141
-RMD160 15d3b29d93d86cde7457dcd56e29f8d0d2acf64f files/digest-sparc-utils-1.9-r3 141
-SHA256 04c69d7442d76761c6710428001196f10a41c9f8294facb345622d8c463df211 files/digest-sparc-utils-1.9-r3 141
+DIST sparc-utils_1.9-2.diff.bz2 7992 RMD160 5d6ed8c107897f2fa71613f7c3dd73c28f966193 SHA1 753bdf216233e62b146ab85e53c6789d17a93d61 SHA256 8124c0ac7d5269ecc4469b6cb0918e5f1797326025ab407822ce536af9f65829
+DIST sparc-utils_1.9.orig.tar.gz 110080 RMD160 9827d9ff7cb4f06d4fb3709593e341e6a3b71a2e SHA1 5dc670e0849b89a2c4c46783528133d46e03ec4b SHA256 b652bc27f95dcf10a7626b1d2943a1084e1e0b7f9bd3a97f9a46b6688370fe4b
+EBUILD sparc-utils-1.9-r3.ebuild 2434 RMD160 0be24003542925e5b880d47748e4c544b87382aa SHA1 9bb047f76577905e62eceda7e4bd961b98d93a03 SHA256 75f6b490ec321e5a6439793287ae948238010d6962625da96b7513fe08b229e0
+MD5 5e8ef343fcf2345538d758478d2a2248 sparc-utils-1.9-r3.ebuild 2434
+RMD160 0be24003542925e5b880d47748e4c544b87382aa sparc-utils-1.9-r3.ebuild 2434
+SHA256 75f6b490ec321e5a6439793287ae948238010d6962625da96b7513fe08b229e0 sparc-utils-1.9-r3.ebuild 2434
+MISC ChangeLog 3021 RMD160 40ee370ab214ba0b504994be995bd27f68b1722b SHA1 08d08845b67fa29662342d3c8eb66d568b5b46dc SHA256 0406166255832327c94a742a1772b7c61ffc27cbbfc900c16e1b095b7f709adf
+MD5 748bf6744e8155d0a8b181d8021c0058 ChangeLog 3021
+RMD160 40ee370ab214ba0b504994be995bd27f68b1722b ChangeLog 3021
+SHA256 0406166255832327c94a742a1772b7c61ffc27cbbfc900c16e1b095b7f709adf ChangeLog 3021
+MISC metadata.xml 420 RMD160 b34d46849a98dbb4a21a0193cf6d63a4cb9dee35 SHA1 cb4662a7557c03abaeb5d27c8f3b024a426dcf1a SHA256 bc8be7e68149121d23d293f5c41e728c3ac66cb467fed3e653ae535ba7556d2d
 MD5 1281e21ae801232cac21628092fbc7f9 metadata.xml 420
 RMD160 b34d46849a98dbb4a21a0193cf6d63a4cb9dee35 metadata.xml 420
 SHA256 bc8be7e68149121d23d293f5c41e728c3ac66cb467fed3e653ae535ba7556d2d metadata.xml 420
-MD5 aaaaf83c247fa7e324e1199f5bed8112 sparc-utils-1.9-r3.ebuild 2017
-RMD160 a5f0abaf059a7ed469681f7995a7989937f4090c sparc-utils-1.9-r3.ebuild 2017
-SHA256 9aec878f6cca3575b7dcbdad279d0ff7539d4f751888c9121d2d561959e1283e sparc-utils-1.9-r3.ebuild 2017
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEPDqd2+ySkm8kpY0RArB4AJ9OR9VMow15HZ1M2zMd2z27MJ4ZrQCfV0yY
-oRqqAoGVqGRyfZMDIHyIMEI=
-=vTNz
------END PGP SIGNATURE-----
+MD5 a7cdd03df79c51071edc01a86e33fd7a files/digest-sparc-utils-1.9-r3 515
+RMD160 162278c1be3a50f83d072d88cc15001c195394d2 files/digest-sparc-utils-1.9-r3 515
+SHA256 c1bdf9da175b877184eea84b972e71f3a81993d4af73e359398ee6bbc23ac751 files/digest-sparc-utils-1.9-r3 515
diff --git a/sys-apps/sparc-utils/files/digest-sparc-utils-1.9-r3 b/sys-apps/sparc-utils/files/digest-sparc-utils-1.9-r3
index 2eb7f575c7f0..03d2c54b6bb3 100644
--- a/sys-apps/sparc-utils/files/digest-sparc-utils-1.9-r3
+++ b/sys-apps/sparc-utils/files/digest-sparc-utils-1.9-r3
@@ -1,2 +1,6 @@
 MD5 50bd3e4749473b3effdb00981220f09f sparc-utils_1.9-2.diff.bz2 7992
+RMD160 5d6ed8c107897f2fa71613f7c3dd73c28f966193 sparc-utils_1.9-2.diff.bz2 7992
+SHA256 8124c0ac7d5269ecc4469b6cb0918e5f1797326025ab407822ce536af9f65829 sparc-utils_1.9-2.diff.bz2 7992
 MD5 08bf3f6d8433a1f4981a2afaa6b49a6c sparc-utils_1.9.orig.tar.gz 110080
+RMD160 9827d9ff7cb4f06d4fb3709593e341e6a3b71a2e sparc-utils_1.9.orig.tar.gz 110080
+SHA256 b652bc27f95dcf10a7626b1d2943a1084e1e0b7f9bd3a97f9a46b6688370fe4b sparc-utils_1.9.orig.tar.gz 110080
diff --git a/sys-apps/sparc-utils/sparc-utils-1.9-r3.ebuild b/sys-apps/sparc-utils/sparc-utils-1.9-r3.ebuild
index 5b3c7d2bc950..bb65e81bbaf1 100644
--- a/sys-apps/sparc-utils/sparc-utils-1.9-r3.ebuild
+++ b/sys-apps/sparc-utils/sparc-utils-1.9-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sparc-utils/sparc-utils-1.9-r3.ebuild,v 1.2 2006/04/11 23:23:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sparc-utils/sparc-utils-1.9-r3.ebuild,v 1.3 2006/09/19 02:00:32 weeve Exp $
 
 inherit eutils toolchain-funcs
 
@@ -19,6 +19,14 @@ RDEPEND="sys-apps/setarch"
 
 S=${WORKDIR}/${P}.orig
 
+# NOTE: If a system has >=sys-kernel/linux-headers-2.6.0, don't build audioctl
+#       as the SPARC sound drivers have been replaced by their ALSA equivalents
+
+pkg_setup() {
+	has_version '>=sys-kernel/linux-headers-2.6.0' && \
+		einfo "Linux 2.6 kernel headers detected, not building audioctl"
+}
+
 src_unpack() {
 	unpack ${A}
 	epatch ${WORKDIR}/${PN}_${PV}-2.diff
@@ -28,7 +36,8 @@ src_compile() {
 	emake -C elftoaout-2.3 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
 	emake -C src piggyback piggyback64 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
 	emake -C prtconf-1.3 CC="$(tc-getCC)" all || die
-	emake -C audioctl-1.3 CC="$(tc-getCC)" || die
+	has_version '>=sys-kernel/linux-headers-2.6.0'  || \
+		emake -C audioctl-1.3 CC="$(tc-getCC)" || die
 }
 
 src_install() {
@@ -44,12 +53,13 @@ src_install() {
 	dosbin prtconf-1.3/prtconf || die
 	dosbin prtconf-1.3/eeprom || die
 
-	dobin audioctl-1.3/audioctl || die
-
-	newinitd "${FILESDIR}"/audioctl.init audioctl || die
-	newconfd debian/audioctl.def audioctl || die
+	if ! has_version '>=sys-kernel/linux-headers-2.6.0'; then
+		dobin audioctl-1.3/audioctl || die
+		newinitd "${FILESDIR}"/audioctl.init audioctl || die
+		newconfd debian/audioctl.def audioctl || die
+		doman audioctl-1.3/audioctl.1
+	fi
 
-	doman audioctl-1.3/audioctl.1
 	doman elftoaout-2.3/elftoaout.1
 	doman prtconf-1.3/prtconf.8
 	doman prtconf-1.3/eeprom.8