Adding patches for our custom LIBDIR.

svn path=/; revision=45

4 files changed, 54 insertions, 16 deletions

diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 9e5be62..6ce0ed6 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,8 +1,16 @@
+AUX vzctl-3.0.12-libdir.patch 366 RMD160 a6a683b36ab41bf22e6a1e397126862d1bcf08c8 SHA1 1fdea9d195ed88029a561ab18431fe3feec05a26 SHA256 16e0cfdda4047f91705b8b513d5438097cd9674d487bcb08d4dd396c8088ae8a
+MD5 aaffe1a4f6480eb84f8d5feacf7c4ffe files/vzctl-3.0.12-libdir.patch 366
+RMD160 a6a683b36ab41bf22e6a1e397126862d1bcf08c8 files/vzctl-3.0.12-libdir.patch 366
+SHA256 16e0cfdda4047f91705b8b513d5438097cd9674d487bcb08d4dd396c8088ae8a files/vzctl-3.0.12-libdir.patch 366
+AUX vzctl-3.0.12-libdir64.patch 368 RMD160 8d7e4723590b4a60c0b189bcc1d51f228ee22e23 SHA1 8b1cd2b03d3700180c4b02cdbbd11a6db5f84b20 SHA256 22d680fa017be5337333f11d907ea21b7a5ab18fabfa96519b17692111d1ba4b
+MD5 666fa7c36c9e7f8ac70c59cf94d097cf files/vzctl-3.0.12-libdir64.patch 368
+RMD160 8d7e4723590b4a60c0b189bcc1d51f228ee22e23 files/vzctl-3.0.12-libdir64.patch 368
+SHA256 22d680fa017be5337333f11d907ea21b7a5ab18fabfa96519b17692111d1ba4b files/vzctl-3.0.12-libdir64.patch 368
 DIST vzctl-3.0.12.tar.bz2 124775 RMD160 f98fdc5c6ed9a33e182e0282560bb1affc4f6125 SHA1 e09dcf7009a3715785cf150d5810b25123bb5015 SHA256 b319eda426a1bfdcd5d6f389ac153986d844efeaf7e83c9af3576411058e842d
-EBUILD vzctl-3.0.12.ebuild 2077 RMD160 54048eac99089edadad2d406700a88565884c7d3 SHA1 6eea2175915f0064635dd1a38603e15769d01877 SHA256 7a641072fcc1127ce492d20ea548f8ee181d17ab88f595c9f53db4f00d43ad52
-MD5 1dad546a9aaac74c2b4c1bfe07952f60 vzctl-3.0.12.ebuild 2077
-RMD160 54048eac99089edadad2d406700a88565884c7d3 vzctl-3.0.12.ebuild 2077
-SHA256 7a641072fcc1127ce492d20ea548f8ee181d17ab88f595c9f53db4f00d43ad52 vzctl-3.0.12.ebuild 2077
+EBUILD vzctl-3.0.12.ebuild 2193 RMD160 c18ad46a501599928766d2e20b63944e41b39c23 SHA1 46b6e489321f047267c631516bef47d79ef3bdba SHA256 62ade2040e509ac01d2220a62dc6d8b7f5d8944f33900f4c08168c46b66408f4
+MD5 b3ac4d53dff94e654a69d54cc87026ed vzctl-3.0.12.ebuild 2193
+RMD160 c18ad46a501599928766d2e20b63944e41b39c23 vzctl-3.0.12.ebuild 2193
+SHA256 62ade2040e509ac01d2220a62dc6d8b7f5d8944f33900f4c08168c46b66408f4 vzctl-3.0.12.ebuild 2193
 MD5 22e28b31f4ee293763d4ef50cc69da3f files/digest-vzctl-3.0.12 241
 RMD160 f7cd3ed3af7fcf41ba414930431b9c77fb7d769b files/digest-vzctl-3.0.12 241
 SHA256 97696e9bc738122573c3fe1b843787764b11131c09dda786d3d4a20b1e62c3a2 files/digest-vzctl-3.0.12 241
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.12-libdir.patch b/sys-cluster/vzctl/files/vzctl-3.0.12-libdir.patch
new file mode 100644
index 0000000..cea7296
--- /dev/null
+++ b/sys-cluster/vzctl/files/vzctl-3.0.12-libdir.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile b/src/Makefile
+index a8be2d2..85397da 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -17,7 +17,7 @@ #
+      INSTALL = install
+       PREFIX = /usr
+      SBINDIR = $(PREFIX)/sbin
+-      LIBDIR = $(PREFIX)/lib/vzctl/lib
++      LIBDIR = $(PREFIX)/lib
+      CONFDIR = /etc/vz
+    GLBCONFIG = $(CONFDIR)/vz.conf
+   VPSCONFDIR = $(CONFDIR)/conf
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.12-libdir64.patch b/sys-cluster/vzctl/files/vzctl-3.0.12-libdir64.patch
new file mode 100644
index 0000000..a717a15
--- /dev/null
+++ b/sys-cluster/vzctl/files/vzctl-3.0.12-libdir64.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile b/src/Makefile
+index a8be2d2..85397da 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -17,7 +17,7 @@ #
+      INSTALL = install
+       PREFIX = /usr
+      SBINDIR = $(PREFIX)/sbin
+-      LIBDIR = $(PREFIX)/lib/vzctl/lib
++      LIBDIR = $(PREFIX)/lib64
+      CONFDIR = /etc/vz
+    GLBCONFIG = $(CONFDIR)/vz.conf
+   VPSCONFDIR = $(CONFDIR)/conf
diff --git a/sys-cluster/vzctl/vzctl-3.0.12.ebuild b/sys-cluster/vzctl/vzctl-3.0.12.ebuild
index 7e04c20..22642a8 100644
--- a/sys-cluster/vzctl/vzctl-3.0.12.ebuild
+++ b/sys-cluster/vzctl/vzctl-3.0.12.ebuild
@@ -28,7 +28,8 @@ DEPEND="${RDEPEND}"
 src_unpack() {
 	unpack ${A}
 
-#	epatch "${WORKDIR}"/patches/*.patch
+	use amd64 && epatch "${FILESDIR}/${P}-libdir64.patch"
+	use x86 && epatch "${FILESDIR}/${P}-libdir.patch"
 }
 
 src_compile() {
@@ -37,28 +38,31 @@ src_compile() {
 }
 
 src_install() {
-#	make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/vzctl" install || die "make install failed"
-	make DESTDIR="${D}" install || die "make install failed"
+	make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/vzctl" install || die "make install failed"
 
 	# the get_libdir in `make install' breaks src/Makefile's logic (and thus all
 	# contained tools), so we have to create a env.d entry for vzctl's LDPATH.
-#	dodir /etc/env.d
-#	echo "LDPATH=\"/usr/$(get_libdir)/vzctl\"" > "${D}"/etc/env.d/05vzctl
+	dodir /etc/env.d
+	echo "LDPATH=\"/usr/$(get_libdir)/vzctl\"" > "${D}"/etc/env.d/05vzctl
 
 	# setup udev rules for /dev/vzctl
-#	if use udev; then
-#		dodir /etc/udev/rules.d
-#		echo 'KERNEL="vzctl", NAME="%k", MODE="0600"' > "${D}"/etc/udev/rules.d/60-vzctl.rules
-#	fi
+	if use udev; then
+		dodir /etc/udev/rules.d
+		echo 'KERNEL="vzctl", NAME="%k", MODE="0600"' > "${D}"/etc/udev/rules.d/60-vzctl.rules
+	fi
 
 	# Provide a symlink for vz.conf (fixing #138462)
 	dosym /etc/vz/vz.conf /etc/conf.d/vz
 
+	# Remove cruftie sysconfig entries
+	# We can get rid of that once ovz #254 is solved
+	rm -rf "${D}"/etc/sysconfig
+
 	# Install gentoo specific init script
-#	rm -f "${D}"/etc/init.d/*
-#	newinitd "${WORKDIR}"/init.d/vz.initd vz
+	rm -f "${D}"/etc/init.d/*
+	newinitd "${WORKDIR}"/init.d/vz.initd vz
 
-#	dodoc "${WORKDIR}/patches/000_README"
+	dodoc "${WORKDIR}/patches/000_README"
 }
 
 pkg_postinst() {