fix libdir; add warning

Package-Manager: portage-2.1.1_pre1

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index da9a890e772c2f8485df724e22c44a2fa1d77249..f3c84385e2835eef489878dbd4c5d30bb619088d 100644 (file)
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-cluster/vzctl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.25 2006/06/19 20:29:50 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.26 2006/06/22 04:28:44 hollow Exp $
+
+  22 Jun 2006; Benedikt Böhm <hollow@gentoo.org> vzctl-3.0.10.ebuild:
+  fix libdir; add warning
 
 *vzctl-3.0.10 (19 Jun 2006)
 

diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index b9a489bcbebc5ee9e2b5066b66926cc97a8213ea..670dd645ff7412f3bc2bdf1269370f8a290c9ecd 100644 (file)
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -13,12 +13,12 @@ AUX vzctl-3.0.10-as-needed.patch 2873 RMD160 fd68de2965e760119ff733228bed686f3ec
 MD5 0414e832d240f2f381486930011960a7 files/vzctl-3.0.10-as-needed.patch 2873
 RMD160 fd68de2965e760119ff733228bed686f3ecc002c files/vzctl-3.0.10-as-needed.patch 2873
 SHA256 7eebb62833d9987d1df650fe3dca86e9bfa26e006b59f15ec29497d4177ff198 files/vzctl-3.0.10-as-needed.patch 2873
-DIST vzctl-3.0.0-4.tar.bz2 100466 RMD160 75958a8ac68ae6a644db3c2f825bab18d8b4ded2 SHA256 e23caf8c0766d9a4f60b1e069cda51016344a78cd43938846f31eb5899693d8c
-DIST vzctl-3.0.0-7.tar.bz2 114219 RMD160 f2f0ab5c5ef52ed9f82086539c83ba45a6612bc6 SHA256 b06b647d62f8b5d8c924f3e9b2ecf4716a38b5ae1292a8338692b9c528e18a29
-DIST vzctl-3.0.0-8.tar.bz2 115033 RMD160 5bba4d678ea617f05220b4aca921ea62cd355e98 SHA256 7322bebc6f6b476cd2c8a1f9a3e601f9e723142ee317eb3304d40d0e068fc632
-DIST vzctl-3.0.0.4-patches-r0.tar.bz2 3826 RMD160 b6bad5eb32b7a997b321a052e613fe3ccb4a5366 SHA256 4c763deacb4070850a5352d23b643d1b109e44e5f713898471ee42884583774d
-DIST vzctl-3.0.0.7-patches-r0.tar.bz2 3822 RMD160 81ef3c67b2e585bd4cb2094252614290623db647 SHA256 29f6f89c17ea8bedbe5e35fcb60731cfafbcccb9d2336b126968a9f586358006
-DIST vzctl-3.0.0.8-patches-r0.tar.bz2 3816 RMD160 33fa63aa9749beedf6bd7dfd03f11658edfa6266 SHA256 f1ac3df3a9f6f0f62ef97dd0b770cee800c37e3a267105c8fddc2f68dd05d535
+DIST vzctl-3.0.0-4.tar.bz2 100466 RMD160 75958a8ac68ae6a644db3c2f825bab18d8b4ded2 SHA1 5b9b39fde17932542a4d7cd1fe9584ddc966728e SHA256 e23caf8c0766d9a4f60b1e069cda51016344a78cd43938846f31eb5899693d8c
+DIST vzctl-3.0.0-7.tar.bz2 114219 RMD160 f2f0ab5c5ef52ed9f82086539c83ba45a6612bc6 SHA1 ea3c109bca7742ec0b124bcd1a12aeafead14036 SHA256 b06b647d62f8b5d8c924f3e9b2ecf4716a38b5ae1292a8338692b9c528e18a29
+DIST vzctl-3.0.0-8.tar.bz2 115033 RMD160 5bba4d678ea617f05220b4aca921ea62cd355e98 SHA1 f6dc12f3572897cbc9f0ebf8b4f438756b320983 SHA256 7322bebc6f6b476cd2c8a1f9a3e601f9e723142ee317eb3304d40d0e068fc632
+DIST vzctl-3.0.0.4-patches-r0.tar.bz2 3826 RMD160 b6bad5eb32b7a997b321a052e613fe3ccb4a5366 SHA1 fa1df262189f309ec82e3aa197d2d7248c6d12f9 SHA256 4c763deacb4070850a5352d23b643d1b109e44e5f713898471ee42884583774d
+DIST vzctl-3.0.0.7-patches-r0.tar.bz2 3822 RMD160 81ef3c67b2e585bd4cb2094252614290623db647 SHA1 a5cd2c241cee50ded7d301b5401d9c42fc2e17ce SHA256 29f6f89c17ea8bedbe5e35fcb60731cfafbcccb9d2336b126968a9f586358006
+DIST vzctl-3.0.0.8-patches-r0.tar.bz2 3816 RMD160 33fa63aa9749beedf6bd7dfd03f11658edfa6266 SHA1 727e323d73c3505ebc47221850df7f695f7bc43d SHA256 f1ac3df3a9f6f0f62ef97dd0b770cee800c37e3a267105c8fddc2f68dd05d535
 DIST vzctl-3.0.10.tar.bz2 124070 RMD160 e3a1ae0846a5b7b8a054fb416c20eb7ae57d0008 SHA1 99acb9b213e5d463144b32fb40975a3c4ac2e66a SHA256 5509857493533cf68b55a2183154aac12d23ab65d555db3b4328c0619ca8080f
 EBUILD vzctl-3.0.0.4.ebuild 1813 RMD160 cb61a663ce83855f125df9344ccd123be839984f SHA1 824f1633ec7976520ed22e4e93af798c5430b04b SHA256 450c1f612d23389e39e9c4c872f4e35c47b426156e49c6227c96a34e4fc593d5
 MD5 f2fa78bd584eb208b868ea61f5f753a2 vzctl-3.0.0.4.ebuild 1813
@@ -32,14 +32,14 @@ EBUILD vzctl-3.0.0.8.ebuild 1722 RMD160 b8dcb0398d5eea198ec644d3df4e51eb68394bf9
 MD5 c95923e684f3f56566d1557f5098840c vzctl-3.0.0.8.ebuild 1722
 RMD160 b8dcb0398d5eea198ec644d3df4e51eb68394bf9 vzctl-3.0.0.8.ebuild 1722
 SHA256 b2d5707ee42ed25a5ce219ea9e364ce1df2ba5661e8072063fdaa423507e4e06 vzctl-3.0.0.8.ebuild 1722
-EBUILD vzctl-3.0.10.ebuild 943 RMD160 09000e0b616cff84904f2a6b7687ca1617f80b7f SHA1 5454ade2a93c2e5ea690f7a20a626dab6881a8ef SHA256 0a7df623a952f572787be1157831751e1f08c2a771e2bd455de6694e382a34ec
-MD5 5cecdf66c7b311fc0e9c52200e8395a7 vzctl-3.0.10.ebuild 943
-RMD160 09000e0b616cff84904f2a6b7687ca1617f80b7f vzctl-3.0.10.ebuild 943
-SHA256 0a7df623a952f572787be1157831751e1f08c2a771e2bd455de6694e382a34ec vzctl-3.0.10.ebuild 943
-MISC ChangeLog 4639 RMD160 7e0b4c439aa752ebf990283026e95e36aabfe8d7 SHA1 b5d52cede501d4d9b87fbee2fcbbe7e1369a4a9d SHA256 0d7ea68db897be543e76dee1e8d237c8342b9eaa7e9b6ffa23c33a1b9083da49
-MD5 c02963c00107a56b047f19decfb6eb0f ChangeLog 4639
-RMD160 7e0b4c439aa752ebf990283026e95e36aabfe8d7 ChangeLog 4639
-SHA256 0d7ea68db897be543e76dee1e8d237c8342b9eaa7e9b6ffa23c33a1b9083da49 ChangeLog 4639
+EBUILD vzctl-3.0.10.ebuild 1263 RMD160 121d416fe1666c16344eebaa2d648888f9d7c303 SHA1 ee28945a6fa64e6eb5bdf1854ec732cb29eb217b SHA256 63674f0337ec5474d943d208338eb5bb5ce459ba8d039261630a8a4036993bb7
+MD5 bda3a2ca4377fc99fe08f1f4e379b103 vzctl-3.0.10.ebuild 1263
+RMD160 121d416fe1666c16344eebaa2d648888f9d7c303 vzctl-3.0.10.ebuild 1263
+SHA256 63674f0337ec5474d943d208338eb5bb5ce459ba8d039261630a8a4036993bb7 vzctl-3.0.10.ebuild 1263
+MISC ChangeLog 4737 RMD160 8c9864c6d6f9e78d197feb0262212cde56f15e2b SHA1 60d95dac97de362e58c56e6f6c50c8bf2d27fa59 SHA256 8ad7c6098262d030fb4817480ce9d90e443d6acb9af098b69de0fe023a244632
+MD5 22cba0cc7f7b460078f4c06a20e1a819 ChangeLog 4737
+RMD160 8c9864c6d6f9e78d197feb0262212cde56f15e2b ChangeLog 4737
+SHA256 8ad7c6098262d030fb4817480ce9d90e443d6acb9af098b69de0fe023a244632 ChangeLog 4737
 MISC metadata.xml 231 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 SHA1 5e2b3b183660e76e9a8d93b7aeab6ce5857581c1 SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442
 MD5 e5ba31c20aa49371e645a8950abd1054 metadata.xml 231
 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 metadata.xml 231
@@ -59,7 +59,7 @@ SHA256 f8a7e2630d02bb442a709d0486c7028b1b75b93d53ea747661a1e6b93095c8d7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFElwlFflZ8QqxhrsMRAl5hAKCDKWuSNfSiR0hy1rpuCnQ2CxRODgCgpee3
-/6rUYvDuu8ZzhqoA8EE6U+A=
-=orBq
+iD8DBQFEmhyGmPFBzbX68WERAq7fAJ0Yy38wMWOyaIcH/Ay4vFkMdJXRVACeLGOc
+MuMM+jXyy1nKQ8Ac1NMtf3I=
+=Xuyc
 -----END PGP SIGNATURE-----

diff --git a/sys-cluster/vzctl/vzctl-3.0.10.ebuild b/sys-cluster/vzctl/vzctl-3.0.10.ebuild
index 9a8df00f467d30c2b4b1e72021b467d12628a407..c1bf540dccbb50415fba1d11d784ce6f761fcfd5 100644 (file)
--- a/sys-cluster/vzctl/vzctl-3.0.10.ebuild
+++ b/sys-cluster/vzctl/vzctl-3.0.10.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-cluster/vzctl/vzctl-3.0.10.ebuild,v 1.1 2006/06/19 20:29:50 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.10.ebuild,v 1.2 2006/06/22 04:28:44 hollow Exp $
 
 inherit eutils
 
@@ -14,29 +14,37 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="app-admin/logrotate
-       app-shells/bash
-       sys-apps/sed
        sys-apps/ed
-       sys-apps/grep
-       sys-apps/gawk
-       sys-apps/coreutils
        net-firewall/iptables
-       app-arch/tar
        sys-fs/vzquota
-       sys-process/procps
        sys-apps/iproute2"
 
 DEPEND="${RDEPEND}"
 
 src_unpack() {
        unpack ${A}
+       cd "${S}"
+
        epatch "${FILESDIR}"/${P}-Makefile.patch
        epatch "${FILESDIR}"/${P}-as-needed.patch
 }
 
 src_install() {
-       make DESTDIR="${D}" install || die "make install failed"
+       make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/vzctl" install || die "make install failed"
 
        # Install gentoo specific init script
        newinitd "${FILESDIR}"/vz.initd vz
 }
+
+pkg_postinst() {
+       if has_version "<3.0.10"; then
+               ewarn
+               ewarn "The location of some vzctl files have changed. Most notably,"
+               ewarn "VE configuration files and samples directory has changed from"
+               ewarn "/etc/vz to /etc/vz/conf. In order to be able to work with"
+               ewarn "your VEs, please do the following:"
+               ewarn
+               ewarn "bash# mv /etc/vz/[0-9]*.conf /etc/vz/conf/"
+               ewarn
+       fi
+}