Various ebuild fixes. Resolves bug #150957 and bug #170842.

Package-Manager: portage-2.1.2.2

5 files changed, 75 insertions, 95 deletions

diff --git a/x11-base/x11-drm/ChangeLog b/x11-base/x11-drm/ChangeLog
index 7181aec98c74..a4b6b6b0350e 100644
--- a/x11-base/x11-drm/ChangeLog
+++ b/x11-base/x11-drm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/x11-drm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.51 2007/03/14 17:08:12 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.52 2007/03/14 18:18:53 battousai Exp $
+
+  14 Mar 2007; Bryan Stine <battousai@gentoo.org> x11-drm-20060608.ebuild,
+  x11-drm-20060608-r1.ebuild, x11-drm-20070314.ebuild:
+  Ebuild fixes across the board since 20060608 for proper linux-mod and
+  autotools usage, as well as KBUILD_OUTPUT support. Thanks jakub(bug #150957)
+  and Zhang Le(bug #170842).
 
 *x11-drm-20070314 (14 Mar 2007)
 
diff --git a/x11-base/x11-drm/Manifest b/x11-base/x11-drm/Manifest
index cec2b6d822ae..73769e7cc453 100644
--- a/x11-base/x11-drm/Manifest
+++ b/x11-base/x11-drm/Manifest
@@ -12,22 +12,22 @@ EBUILD x11-drm-20051223.ebuild 6384 RMD160 e28ebee2ce1caf5c90dc2e944a04911ba2c02
 MD5 95c3e96dee51eaca5684499b709a2b9b x11-drm-20051223.ebuild 6384
 RMD160 e28ebee2ce1caf5c90dc2e944a04911ba2c02089 x11-drm-20051223.ebuild 6384
 SHA256 1b38d0282cab1bfbbeb36bade40ea03a3604e8d50121aef958611afcadc464ac x11-drm-20051223.ebuild 6384
-EBUILD x11-drm-20060608-r1.ebuild 8514 RMD160 9cb549e0dbc5484d2b00f44b5fbe4c5a4551878c SHA1 de89f59be220da3aefbf9394b68cf45d2d901847 SHA256 920cb3b424368da665dfac9a18d1edb67784f1efa0b479fbaeca1effd12268b3
-MD5 17b1a5accd65c1348c940ade55be8946 x11-drm-20060608-r1.ebuild 8514
-RMD160 9cb549e0dbc5484d2b00f44b5fbe4c5a4551878c x11-drm-20060608-r1.ebuild 8514
-SHA256 920cb3b424368da665dfac9a18d1edb67784f1efa0b479fbaeca1effd12268b3 x11-drm-20060608-r1.ebuild 8514
-EBUILD x11-drm-20060608.ebuild 6379 RMD160 b8340bd8798160685db4442b1e90168cb1add4b1 SHA1 0b1a95b1bb48268c056d9678a5ba1ff5c1b3f0c0 SHA256 b9dbe05bbc3e9e00300877b4ae5efc11983b8ca9c73af3d8a2c6e531aba53d02
-MD5 5119f40b8342c2075e6fc15d03848fa6 x11-drm-20060608.ebuild 6379
-RMD160 b8340bd8798160685db4442b1e90168cb1add4b1 x11-drm-20060608.ebuild 6379
-SHA256 b9dbe05bbc3e9e00300877b4ae5efc11983b8ca9c73af3d8a2c6e531aba53d02 x11-drm-20060608.ebuild 6379
-EBUILD x11-drm-20070314.ebuild 8270 RMD160 281915f25e37ac0eb1ea9892dc4e02edd8fc90aa SHA1 99ecedde9cda09013b326d21617b8b9e75c3ab82 SHA256 68392341de8b4bc722650250867f9858d924799371572ffce40f0edf25917667
-MD5 95c3e39530b92bdc4353360de0e5aab8 x11-drm-20070314.ebuild 8270
-RMD160 281915f25e37ac0eb1ea9892dc4e02edd8fc90aa x11-drm-20070314.ebuild 8270
-SHA256 68392341de8b4bc722650250867f9858d924799371572ffce40f0edf25917667 x11-drm-20070314.ebuild 8270
-MISC ChangeLog 23073 RMD160 6f3c8982796af1d2c94ad8e8fb6c11ca6a641083 SHA1 8063d053a992fb2b46f5a594e93e3799919dbfff SHA256 1e3c6417fce83a7187d358cdca03c4b0dbdba642c887a36c2ef52b2e3c825e67
-MD5 73d1bb2bed38c422717cd54d3e93f5d1 ChangeLog 23073
-RMD160 6f3c8982796af1d2c94ad8e8fb6c11ca6a641083 ChangeLog 23073
-SHA256 1e3c6417fce83a7187d358cdca03c4b0dbdba642c887a36c2ef52b2e3c825e67 ChangeLog 23073
+EBUILD x11-drm-20060608-r1.ebuild 8260 RMD160 db25e09b98ab6657f20857e27a354ced3842451b SHA1 c73ec21c4e2e0e7d82004341262dea10aa9a5297 SHA256 a43a1395a9a175fe7f4eb7e31e9b8a65e37e1130939a3a2f6e2ce66fb30d947c
+MD5 95ce2251490387323e1dca9a354a3f61 x11-drm-20060608-r1.ebuild 8260
+RMD160 db25e09b98ab6657f20857e27a354ced3842451b x11-drm-20060608-r1.ebuild 8260
+SHA256 a43a1395a9a175fe7f4eb7e31e9b8a65e37e1130939a3a2f6e2ce66fb30d947c x11-drm-20060608-r1.ebuild 8260
+EBUILD x11-drm-20060608.ebuild 6136 RMD160 6a4527d9c90e389531c81895a68322cdd587f160 SHA1 232c493ce2d4d2c161c903103d0acf1b7e3d5e8a SHA256 cdef0c4be4d31e8e33cccbc08ee1960a43642f5c287762fab07c1812ae09307f
+MD5 d2226b9a5edf79c7b6644f793d8078dd x11-drm-20060608.ebuild 6136
+RMD160 6a4527d9c90e389531c81895a68322cdd587f160 x11-drm-20060608.ebuild 6136
+SHA256 cdef0c4be4d31e8e33cccbc08ee1960a43642f5c287762fab07c1812ae09307f x11-drm-20060608.ebuild 6136
+EBUILD x11-drm-20070314.ebuild 8056 RMD160 d58870abeb62aa3b17b1e5f67053e70603068583 SHA1 bb152bde06dada634ec3ad4d0c40f71a58fd9756 SHA256 c70df87da4f81ff78a3569c912df6def8f8d786f17da00de001bb7ccce0928cc
+MD5 8f6726bb5fce73c90f3b2d100a8dbc75 x11-drm-20070314.ebuild 8056
+RMD160 d58870abeb62aa3b17b1e5f67053e70603068583 x11-drm-20070314.ebuild 8056
+SHA256 c70df87da4f81ff78a3569c912df6def8f8d786f17da00de001bb7ccce0928cc x11-drm-20070314.ebuild 8056
+MISC ChangeLog 23384 RMD160 78f3a22cd81ffef28246b2c9e5a4f1b2e391d99f SHA1 e14a88f998e3f849f5600facaa31d479adf020c3 SHA256 249fc8d189c64567290eacdf1839d50674dbafb42e8493f112448ca55ef23f05
+MD5 4952d7b7dd992717e8b7efc25d2fe471 ChangeLog 23384
+RMD160 78f3a22cd81ffef28246b2c9e5a4f1b2e391d99f ChangeLog 23384
+SHA256 249fc8d189c64567290eacdf1839d50674dbafb42e8493f112448ca55ef23f05 ChangeLog 23384
 MISC metadata.xml 368 RMD160 cbe279aeafeae0af3633fbd1ecaa59d2f54579b8 SHA1 5104adf2f1ebe1ddffe4ca95e7b5e5f06267f842 SHA256 e73a5c428f39881de8ae5acf40958e8ad37a5fe92c2bb8cc4060704c9be45ef1
 MD5 782be9470cf76716a15aa5a70f4b8af7 metadata.xml 368
 RMD160 cbe279aeafeae0af3633fbd1ecaa59d2f54579b8 metadata.xml 368
diff --git a/x11-base/x11-drm/x11-drm-20060608-r1.ebuild b/x11-base/x11-drm/x11-drm-20060608-r1.ebuild
index d2912bd9612b..f224e9b57131 100644
--- a/x11-base/x11-drm/x11-drm-20060608-r1.ebuild
+++ b/x11-base/x11-drm/x11-drm-20060608-r1.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608-r1.ebuild,v 1.5 2007/01/04 07:31:03 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608-r1.ebuild,v 1.6 2007/03/14 18:18:53 battousai Exp $
 
-inherit eutils x11 linux-mod
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="1.7"
+
+inherit eutils x11 linux-mod autotools
 
 IUSE_VIDEO_CARDS="
 	video_cards_i810
@@ -20,7 +23,7 @@ IUSE="${IUSE_VIDEO_CARDS} kernel_FreeBSD kernel_linux"
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
-RESTRICT="nostrip"
+RESTRICT="strip"
 
 S="${WORKDIR}/drm"
 PATCHVER="0.3"
@@ -36,14 +39,10 @@ SLOT="0"
 LICENSE="X11"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
 
-DEPEND=">=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.59
-	>=sys-devel/libtool-1.5.14
-	>=sys-devel/m4-1.4
-	kernel_linux? ( virtual/linux-sources )
+DEPEND="kernel_linux? ( virtual/linux-sources )
 	kernel_FreeBSD? ( sys-freebsd/freebsd-sources
-			sys-freebsd/freebsd-mk-defs )
-	>=sys-apps/portage-2.0.49-r13"
+			sys-freebsd/freebsd-mk-defs )"
+RDEPEND=""
 
 pkg_setup() {
 	# Setup the kernel's stuff.
@@ -79,7 +78,7 @@ src_unpack() {
 	src_unpack_os
 
 	cd ${S}
-	WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.7" autoreconf -v --install
+	eautoreconf -v --install
 }
 
 src_compile() {
@@ -133,28 +132,19 @@ kernel_setup() {
 		K_RV=${CHOST/*-freebsd/}
 	elif use kernel_linux
 	then
-		get_version
+		linux-mod_pkg_setup
 
 		if kernel_is 2 6
 		then
-			if linux_chkconfig_builtin "DRM"
-			then
+			linux_chkconfig_builtin "DRM" && \
 				die "Please disable or modularize DRM in the kernel config. (CONFIG_DRM = n or m)"
-			fi
-
-			if ! linux_chkconfig_present "AGP"
-			then
-				einfo "AGP support is not enabled in your kernel config. This may be needed for DRM to"
-				einfo "work, so you might want to double-check that setting. (CONFIG_AGP)"
-				echo
-			fi
+
+			CONFIG_CHECK="AGP"
+			ERROR_AGP="AGP support is not enabled in your kernel config (CONFIG_AGP)"
 		elif kernel_is 2 4
 		then
-			if ! linux_chkconfig_present "DRM"
-			then
-				die "Please enable DRM support in your kernel configuration. (CONFIG_DRM = y or m)."
-				echo
-			fi
+			CONFIG_CHECK="DRM"
+			ERROR_DRM="Please enable DRM support in your kernel configuration. (CONFIG_DRM = y or m)."
 		fi
 	fi
 }
@@ -323,6 +313,7 @@ src_install_linux() {
 		DESTDIR="${D}" \
 		RUNNING_REL="${KV_FULL}" \
 		MODULE_LIST="${VIDCARDS} ${DRM_KMOD}" \
+		O="${KBUILD_OUTPUT}" \
 		install || die "Install failed."
 
 	# Strip binaries, leaving /lib/modules untouched (bug #24415)
diff --git a/x11-base/x11-drm/x11-drm-20060608.ebuild b/x11-base/x11-drm/x11-drm-20060608.ebuild
index 86148c06f884..4b4c99fe7dd6 100644
--- a/x11-base/x11-drm/x11-drm-20060608.ebuild
+++ b/x11-base/x11-drm/x11-drm-20060608.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608.ebuild,v 1.11 2007/01/04 07:31:04 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608.ebuild,v 1.12 2007/03/14 18:18:53 battousai Exp $
 
-inherit eutils x11 linux-mod
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="1.7"
+
+inherit eutils x11 linux-mod autotools
 
 IUSE_VIDEO_CARDS="
 	video_cards_i810
@@ -20,7 +23,7 @@ IUSE="${IUSE_VIDEO_CARDS}"
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
-RESTRICT="nostrip"
+RESTRICT="strip"
 
 S="${WORKDIR}/drm"
 PATCHVER="0.3"
@@ -36,36 +39,21 @@ SLOT="0"
 LICENSE="X11"
 KEYWORDS="alpha amd64 ia64 ppc x86"
 
-DEPEND=">=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.59
-	>=sys-devel/libtool-1.5.14
-	>=sys-devel/m4-1.4
-	virtual/linux-sources
-	>=sys-apps/portage-2.0.49-r13"
+DEPEND="virtual/linux-sources"
+RDEPEND=""
 
 pkg_setup() {
-	get_version
+	linux-mod_pkg_setup
 
-	if kernel_is 2 6
-	then
-		if linux_chkconfig_builtin "DRM"
-		then
+	if kernel_is 2 6 ; then
+		linux_chkconfig_builtin "DRM" && \
 			die "Please disable or modularize DRM in the kernel config. (CONFIG_DRM = n or m)"
-		fi
-
-		if ! linux_chkconfig_present "AGP"
-		then
-			einfo "AGP support is not enabled in your kernel config. This may be needed for DRM to"
-			einfo "work, so you might want to double-check that setting. (CONFIG_AGP)"
-			echo
-		fi
-	elif kernel_is 2 4
-	then
-		if ! linux_chkconfig_present "DRM"
-		then
-			die "Please enable DRM support in your kernel configuration. (CONFIG_DRM = y or m)."
-			echo
-		fi
+		CONFIG_CHECK="AGP"
+		ERROR_AGP="AGP support is not enabled in your kernel config (CONFIG_AGP)"
+
+	elif kernel_is 2 4 ; then
+		CONFIG_CHECK="DRM"
+		ERROR_DRM="Please enable DRM support in your kernel configuration. (CONFIG_DRM = y or m)."
 	fi
 
 	# Set video cards to build for.
@@ -96,7 +84,7 @@ src_unpack() {
 	cp ${S}/tests/*.c ${SRC_BUILD}
 
 	cd ${S}
-	WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.7" autoreconf -v --install
+	eautoreconf -v --install
 }
 
 src_compile() {
@@ -139,6 +127,7 @@ src_install() {
 		DESTDIR="${D}" \
 		RUNNING_REL="${KV_FULL}" \
 		MODULE_LIST="${VIDCARDS} ${DRM_KMOD}" \
+		O="${KBUILD_OUTPUT}" \
 		install || die "Install failed."
 
 	dodoc README.drm
diff --git a/x11-base/x11-drm/x11-drm-20070314.ebuild b/x11-base/x11-drm/x11-drm-20070314.ebuild
index 9857d53f7191..54785838ce5a 100644
--- a/x11-base/x11-drm/x11-drm-20070314.ebuild
+++ b/x11-base/x11-drm/x11-drm-20070314.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild,v 1.1 2007/03/14 17:08:12 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild,v 1.2 2007/03/14 18:18:53 battousai Exp $
 
-inherit eutils x11 linux-mod
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="1.7"
+
+inherit eutils x11 linux-mod autotools
 
 IUSE_VIDEO_CARDS="
 	video_cards_i810
@@ -20,7 +23,7 @@ IUSE="${IUSE_VIDEO_CARDS} kernel_FreeBSD kernel_linux"
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
-RESTRICT="nostrip"
+RESTRICT="strip"
 
 S="${WORKDIR}/drm"
 PATCHVER="0.1"
@@ -36,14 +39,10 @@ SLOT="0"
 LICENSE="X11"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
 
-DEPEND=">=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.59
-	>=sys-devel/libtool-1.5.14
-	>=sys-devel/m4-1.4
-	kernel_linux? ( virtual/linux-sources )
+DEPEND="kernel_linux? ( virtual/linux-sources )
 	kernel_FreeBSD? ( sys-freebsd/freebsd-sources
-			sys-freebsd/freebsd-mk-defs )
-	>=sys-apps/portage-2.0.49-r13"
+			sys-freebsd/freebsd-mk-defs )"
+RDEPEND=""
 
 pkg_setup() {
 	# Setup the kernel's stuff.
@@ -78,7 +77,7 @@ src_unpack() {
 	src_unpack_os
 
 	cd ${S}
-	WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.7" autoreconf -v --install
+	eautoreconf -v --install
 }
 
 src_compile() {
@@ -132,7 +131,7 @@ kernel_setup() {
 		K_RV=${CHOST/*-freebsd/}
 	elif use kernel_linux
 	then
-		get_version
+		linux-mod_pkg_setup
 
 		if kernel_is 2 4
 		then
@@ -141,17 +140,11 @@ kernel_setup() {
 			die "Please use in-kernel DRM or switch to a 2.6 kernel."
 		fi
 
-		if linux_chkconfig_builtin "DRM"
-		then
+		linux_chkconfig_builtin "DRM" && \
 			die "Please disable or modularize DRM in the kernel config. (CONFIG_DRM = n or m)"
-		fi
 
-		if ! linux_chkconfig_present "AGP"
-		then
-			einfo "AGP support is not enabled in your kernel config. This may be needed for DRM to"
-			einfo "work, so you might want to double-check that setting. (CONFIG_AGP)"
-			echo
-		fi
+		CONFIG_CHECK="AGP"
+		ERROR_AGP="AGP support is not enabled in your kernel config (CONFIG_AGP)"
 	fi
 }
 
@@ -314,6 +307,7 @@ src_install_linux() {
 		DESTDIR="${D}" \
 		RUNNING_REL="${KV_FULL}" \
 		MODULE_LIST="${VIDCARDS} ${DRM_KMOD}" \
+		O="${KBUILD_OUTPUT}" \
 		install || die "Install failed."
 
 	# Strip binaries, leaving /lib/modules untouched (bug #24415)