Move modprobe config file to new location, Bug #275151. Remove deprecated NAME=%k from udev rule.

Package-Manager: portage-2.2_rc50/cvs/Linux i686

3 files changed, 117 insertions, 2 deletions

diff --git a/app-emulation/kqemu/ChangeLog b/app-emulation/kqemu/ChangeLog
index 42b4c43857b6..e213674f69cd 100644
--- a/app-emulation/kqemu/ChangeLog
+++ b/app-emulation/kqemu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/kqemu
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/ChangeLog,v 1.28 2009/09/23 15:33:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/ChangeLog,v 1.29 2009/11/20 13:15:10 zzam Exp $
+
+*kqemu-1.4.0_pre1-r1 (20 Nov 2009)
+
+  20 Nov 2009; Matthias Schwarzott <zzam@gentoo.org>
+  +kqemu-1.4.0_pre1-r1.ebuild:
+  Move modprobe config file to new location, Bug #275151. Remove deprecated
+  NAME=%k from udev rule.
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> kqemu-0.7.2.ebuild:
   Remove virtual/libc
diff --git a/app-emulation/kqemu/Manifest b/app-emulation/kqemu/Manifest
index b8143dbcde5a..02dd5758a33c 100644
--- a/app-emulation/kqemu/Manifest
+++ b/app-emulation/kqemu/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kqemu-1.3.0_pre11-sched_h.patch 329 RMD160 2199965106d45c2f7b9a39b9274c051f72d418e1 SHA1 4150f3ae845612a78de27d74b8f66cd0943268e7 SHA256 e40434e2bcd8be18dfa29fc4a8a59c29c5c3287d2d93000eb05e75c0d962ab2e
 AUX kqemu-1.3.0_pre5-fix_module_parm.patch 686 RMD160 974dd24dfb1405043bc20ab218d42443e6a6cf3c SHA1 d05ed564696bdf0db9c587ee8364fd8033e9b750 SHA256 47166817cfcfa7dbf3293703f25b39ad6da9fb403754b929e949278f42529915
 AUX kqemu-1.4.0_pre1-missing-sched-header.patch 273 RMD160 852fa423ab789ce7aa4d08a137227cdea9d5e0df SHA1 d6603c85992e2201938b310b4247446c1dc61e9c SHA256 38bd6054c952d2fc088c12262852129252af8065c8df446d7b8ae157ccf78a93
@@ -13,6 +16,14 @@ EBUILD kqemu-1.3.0_pre11.ebuild 1794 RMD160 2ac5ff4bfae6051f04bb69feff2fa66cc14d
 EBUILD kqemu-1.3.0_pre5.ebuild 1749 RMD160 d057f5b53d79b223ecb8f08ab26ce4daf9724974 SHA1 f844b26e1dde62e5bd60e2de51e50c4ac4cf2d0d SHA256 21817506c76bd0148cf1b7382c190803d9b7b2be7759272027161835ea02be14
 EBUILD kqemu-1.3.0_pre7.ebuild 1782 RMD160 1df2e6992fbaa898ab84270ffecef2cafb14fb9c SHA1 359903d2db64b2475188bdbf3ffe7de0a9bacc4f SHA256 ea40e108c536b508f625c9931deea33f2159fe52690bf9f442d36757304bfe51
 EBUILD kqemu-1.3.0_pre9.ebuild 2034 RMD160 148accd1e8bf8f7ab040e6e97bdfa95091b9f300 SHA1 2605cb6444e8f4b10faf1cde4843e2b8555728ac SHA256 a9c0feed8020d4753d32fbe1d8140468439e273ec3c01bf20f23598a6bc9fb77
+EBUILD kqemu-1.4.0_pre1-r1.ebuild 2540 RMD160 191aad4ba74bbbe4d04708aa42697eb8c5454108 SHA1 7b5bd991f597b422adfbb73000b98a836a3a6778 SHA256 a5b77515123660038cfd59bfc53f343a0f3eda2167b2a487a83c6f9bcd3ca068
 EBUILD kqemu-1.4.0_pre1.ebuild 2046 RMD160 5566ce79c2d9d0777601a290bd97e9d289ceb471 SHA1 e1d878aca1ff9e5d490fea9fe9b1ad8e096f4063 SHA256 46bdbca53adb834504025ba7e1277c16ca43dd920a0ef3089dc053f730ddcfd8
-MISC ChangeLog 4182 RMD160 7fda3bdf353e8ad92a3c5c8fe780f04482fa4a1c SHA1 62453ef15bc5796981cbd885547f03fb291eb19b SHA256 89c9624142acf6c4a2f0fe36f031f50c214152adaa5bfee3ca8f48a202674a88
+MISC ChangeLog 4402 RMD160 c6bb843a9ccb614ff213835bb15aee362ec164bb SHA1 5010984df5bb3b76a29da26395c392d7670353e1 SHA256 64a965e576760972a2c1239ce7d02987cde3c4efe42b3ee37ee9a0062e38ecf7
 MISC metadata.xml 223 RMD160 f054e67dff10c87ea1d0b5753124445be6bd4610 SHA1 fcf66d2b271369d296150dde06603d850623ed27 SHA256 64a96c3c9929aec46b50a63ae1fd8c46cef4a8423f448d6f6fff09e20510c98b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAksGlmkACgkQt2vP6XvVdOc3WACg4ZIlpjHEjY867S5fTe5B4dGE
+ySUAnj2BHlVw/LDimmPkscU/z7r+uA/q
+=+aPo
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/kqemu/kqemu-1.4.0_pre1-r1.ebuild b/app-emulation/kqemu/kqemu-1.4.0_pre1-r1.ebuild
new file mode 100644
index 000000000000..f201bf03a739
--- /dev/null
+++ b/app-emulation/kqemu/kqemu-1.4.0_pre1-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/kqemu-1.4.0_pre1-r1.ebuild,v 1.1 2009/11/20 13:15:10 zzam Exp $
+
+inherit eutils flag-o-matic linux-mod toolchain-funcs
+
+MY_PV=${PV/_/}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Multi-platform & multi-targets cpu emulator and dynamic translator kernel fast execution module"
+HOMEPAGE="http://bellard.org/qemu/"
+SRC_URI="http://bellard.org/qemu/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="strip"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND=""
+RDEPEND=""
+
+pkg_setup() {
+	MODULE_NAMES="kqemu(misc:${S})"
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i 's:MODULE_PARM(\([^,]*\),"i");:module_param(\1, int, 0);:' kqemu-linux.c
+	sed -e 's:-Werror::' -i common/Makefile #260876
+	sed -e '/^CC/d;/^HOST_CC/d;' \
+		-e 's/\(^MON_CC=\).*/\1$(CC)/' \
+		-e "s/\(^MON_LD=\).*/\1$(tc-getLD)/" \
+		-e 's/^\(TOOLS_CFLAGS.*\)/\1 $(CFLAGS)/' \
+		-e 's/^\(MON_CFLAGS.*\)/\1 $(CFLAGS)/' \
+		-e 's/^\(KERNEL_CFLAGS.*\)/\1 $(CFLAGS)/' \
+		-e 's/^CFLAGS=\(.*\)/CFLAGS+=\1/' \
+		-i common/Makefile
+	epatch "${FILESDIR}/${P}-missing-sched-header.patch"
+}
+
+src_compile() {
+	filter-flags -fpie -fstack-protector
+
+	./configure --kernel-path="${KV_DIR}" \
+				--cc="$(tc-getCC)" \
+				--host-cc="$(tc-getBUILD_CC)" \
+				--extra-cflags="${CFLAGS}" \
+				--extra-ldflags="${LDFLAGS}" \
+		|| die "could not configure"
+
+	make || die "Make failed"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	# udev rule
+	dodir /etc/udev/rules.d/
+	echo 'KERNEL=="kqemu*", GROUP="qemu", MODE="0660"' > ${D}/etc/udev/rules.d/48-qemu.rules
+
+	# Module doc
+	dodoc "${S}/README"
+	dohtml "${S}/kqemu-doc.html"
+
+	# module params
+	dodir /etc/modprobe.d
+	echo "options kqemu major=0" > ${D}/etc/modprobe.d/kqemu.conf
+}
+
+pkg_preinst() {
+	linux-mod_pkg_preinst
+	local old1="${ROOT}/etc/modprobe.d/kqemu"
+	local old2="${ROOT}/etc/modules.d/kqemu"
+	local new="${ROOT}/etc/modprobe.d/kqemu.conf"
+	if [[ ! -a "${new}" ]]; then
+		if [[ -a "${old1}" ]]; then
+			elog "Renaming /etc/modprobe.d/kqemu to /etc/modprobe.d/kqemu.conf"
+			mv "${old1}" "${new}"
+		elif [[ -a "${old2}" ]]; then
+			elog "Moving old kqemu configuration in /etc/modules.d to new"
+			elog "location in /etc/modprobe.d"
+			mv "${old2}" "${new}"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	enewgroup qemu
+	elog "Make sure you have the kernel module loaded before running qemu"
+	elog "and your user is in the 'qemu' group"
+}