Installation and build system fixes, bug #338054

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

4 files changed, 58 insertions, 33 deletions

diff --git a/net-wireless/rtl8192se/ChangeLog b/net-wireless/rtl8192se/ChangeLog
index a1ba16f5740c..873af663d740 100644
--- a/net-wireless/rtl8192se/ChangeLog
+++ b/net-wireless/rtl8192se/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/rtl8192se
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl8192se/ChangeLog,v 1.3 2010/09/17 13:40:13 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl8192se/ChangeLog,v 1.4 2010/09/21 20:29:10 chithanh Exp $
+
+*rtl8192se-2.6.0017.0705.2010-r1 (21 Sep 2010)
+
+  21 Sep 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -rtl8192se-2.6.0017.0705.2010.ebuild,
+  +rtl8192se-2.6.0017.0705.2010-r1.ebuild:
+  Installation and build system fixes, bug #338054
 
   17 Sep 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   rtl8192se-2.6.0017.0705.2010.ebuild:
diff --git a/net-wireless/rtl8192se/Manifest b/net-wireless/rtl8192se/Manifest
index e94718070b62..8f7b89f37d05 100644
--- a/net-wireless/rtl8192se/Manifest
+++ b/net-wireless/rtl8192se/Manifest
@@ -1,5 +1,5 @@
 AUX rtl8192se-include-semaphore.patch 395 RMD160 42d66b64e0c8d11688539586ff816a3d34e71ceb SHA1 0866db7020fb2df44152cc403ab1692d69d3ed83 SHA256 a1b623c46e5a63a4e21b4f614f07d4c6dac570ebade1b50a2dd7f7b707b240ff
 DIST rtl8192se_linux_2.6.0017.0705.2010.tar.gz 1978342 RMD160 bbf8d04f9a14b7eda9fba88c694011c69a381f2f SHA1 d3ede1c7d381effa03a382c05dee69fd129586ee SHA256 b2b6036b8af77ca798d0bcbfa01a3a95b04cddf7520a94a821d6346ace7c6622
-EBUILD rtl8192se-2.6.0017.0705.2010.ebuild 752 RMD160 3120fe4c8c832d51cb4bc73a9b87271e92e0b0e0 SHA1 f39cb70a59cb25a121d4b9e13a43c9c5bf6231a3 SHA256 48c3bf0dd9e6236f9366d61801311d639bbde010639b5ae8485b3ddd7f8f1598
-MISC ChangeLog 866 RMD160 ca80aeb8b7f6caf33b4d52262b369fd5f624eb59 SHA1 03b658dde0d318ea6aa009eb8cd7629fca0705cb SHA256 e8bc4bf8edc87a12fbc4a845e3667c7242b78027075c811ee512767009eb4018
+EBUILD rtl8192se-2.6.0017.0705.2010-r1.ebuild 1703 RMD160 2efb6155a4b6ea06449c180cf893d57d1bccf766 SHA1 64c64429499d7d24bc9562ccf098eb3512b6c2dc SHA256 1c4326c85c69f73b4be9d9321d4fde61a952e5efc327a1da48b18ecf4744005e
+MISC ChangeLog 1118 RMD160 c6be6169855ec638520da26f69aced168d17ccf2 SHA1 bd1eaf95e18222fc275139e4dcacda64bf719c41 SHA256 736c5068068abfdcb14f915a88d7a6b48bd849321100aae20a85a38bc99ab5cb
 MISC metadata.xml 275 RMD160 1b1d48ace7eb30ee16b7cd1c33dd9fa695817f08 SHA1 8e66ce36ba12401c927e1b7394b652962a979a52 SHA256 9fcd14bdea1cdbac9fa4d44a3c9728877d7b87266c3553f6519a7aaec9795009
diff --git a/net-wireless/rtl8192se/rtl8192se-2.6.0017.0705.2010-r1.ebuild b/net-wireless/rtl8192se/rtl8192se-2.6.0017.0705.2010-r1.ebuild
new file mode 100644
index 000000000000..01978ad50f21
--- /dev/null
+++ b/net-wireless/rtl8192se/rtl8192se-2.6.0017.0705.2010-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl8192se/rtl8192se-2.6.0017.0705.2010-r1.ebuild,v 1.1 2010/09/21 20:29:10 chithanh Exp $
+
+EAPI=3
+
+inherit base linux-info linux-mod
+
+MY_P="${PN}_linux_${PV}"
+
+DESCRIPTION="RTL8191SE/8192SE wireless chipset driver"
+HOMEPAGE="http:///www.realtek.com.tw/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${PN}-include-semaphore.patch )
+CONFIG_CHECK="CFG80211 MAC80211"
+
+MODULE_NAMES="r8192se_pci(${PN}::${S}/HAL/rtl8192)"
+BUILD_TARGETS="all"
+
+src_prepare() {
+	base_src_prepare
+
+	# fix build system, bug #338054 from sabayon
+	ebegin "Fixing broken build system..."
+	for rtl_makefile in "${S}/Makefile" "${S}/HAL/rtl8192/Makefile" "${S}/rtllib/Makefile"; do
+		sed -i "${rtl_makefile}" -e "s:\`uname -r\`:${KV_FULL}:g" || die "Unable to patch Makefile"
+		sed -i "${rtl_makefile}" -e "s:\$(shell uname -r):${KV_FULL}:g" || die "Unable to patch Makefile (2)"
+		sed -i "${rtl_makefile}" -e "s:\$(shell uname -r|cut -d. -f1,2):${KV_MAJOR}.${KV_MINOR}:g" || die "Unable to patch Makefile (3)"
+		sed -i "${rtl_makefile}" -e "s:\$(shell uname -r | cut -d. -f1,2,3,4):${KV_FULL}:g" || die "Unable to patch Makefile (4)"
+		# useless... moblin stuff
+		sed -i "${rtl_makefile}" -e "s:\$(shell uname -r | cut -d. -f6 | cut -d- -f1):${KV_LOCAL}:g" || die "Unable to patch Makefile (5)"
+		# do not run depmod -a
+		sed -i "${rtl_makefile}" -e 's:/sbin/depmod -a ${shell uname -r}::g' || die "Unable to patch Makefile (6)"
+	done
+	eend $?
+}
diff --git a/net-wireless/rtl8192se/rtl8192se-2.6.0017.0705.2010.ebuild b/net-wireless/rtl8192se/rtl8192se-2.6.0017.0705.2010.ebuild
deleted file mode 100644
index d95f859f4dec..000000000000
--- a/net-wireless/rtl8192se/rtl8192se-2.6.0017.0705.2010.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl8192se/rtl8192se-2.6.0017.0705.2010.ebuild,v 1.3 2010/09/17 13:40:13 chithanh Exp $
-
-EAPI=3
-
-inherit base linux-info linux-mod
-
-MY_P="${PN}_linux_${PV}"
-
-DESCRIPTION="RTL8191SE/8192SE wireless chipset driver"
-HOMEPAGE="http:///www.realtek.com.tw/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-include-semaphore.patch )
-CONFIG_CHECK="CFG80211 MAC80211"
-
-MODULE_NAMES="r8192se_pci(kernel/drivers/${CATEGORY/-//}/${PN}::${S}/HAL/rtl8192)"
-BUILD_TARGETS="all"