From a1c2fcc9235b4c5430b753d641d8b1ee1e3b0b85 Mon Sep 17 00:00:00 2001 From: Christian Heim Date: Thu, 18 Jan 2007 14:52:10 +0000 Subject: [PATCH] Cleaning up the ebuild a bit (thanks to Kir Kolyshkin for being a pain in the ass :)). Package-Manager: portage-2.1.2 --- sys-cluster/vzctl/ChangeLog | 6 +++++- sys-cluster/vzctl/Manifest | 22 ++++++++++---------- sys-cluster/vzctl/vzctl-3.0.14.ebuild | 30 +++++++++++++-------------- 3 files changed, 31 insertions(+), 27 deletions(-) diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog index 18bf532f562e..587bd04166b6 100644 --- a/sys-cluster/vzctl/ChangeLog +++ b/sys-cluster/vzctl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-cluster/vzctl # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.40 2007/01/18 09:40:03 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.41 2007/01/18 14:52:10 phreak Exp $ + + 18 Jan 2007; Christian Heim vzctl-3.0.14.ebuild: + Cleaning up the ebuild a bit (thanks to Kir Kolyshkin for + being a pain in the ass :)). *vzctl-3.0.14 (18 Jan 2007) diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest index f6de24ba4c71..2ed0934f61d8 100644 --- a/sys-cluster/vzctl/Manifest +++ b/sys-cluster/vzctl/Manifest @@ -25,14 +25,14 @@ EBUILD vzctl-3.0.13.ebuild 1870 RMD160 466079e348d8796b00d6db46268414c2940d2de3 MD5 e808e31e8cf567e1f0a63a06b68ead49 vzctl-3.0.13.ebuild 1870 RMD160 466079e348d8796b00d6db46268414c2940d2de3 vzctl-3.0.13.ebuild 1870 SHA256 740161da009861f899deedfc69dadc94960f5d21dea597b89c80aaa665c5f10d vzctl-3.0.13.ebuild 1870 -EBUILD vzctl-3.0.14.ebuild 1705 RMD160 ee294b00faa5d859ac4e13690229ead6ae2b0db5 SHA1 7df5daea34229a006925c6d9ad72fa0cb0b15192 SHA256 a087017898439444c51c6003bf61e4a9efb4b32a5f758bc187b7aa633e7f2b97 -MD5 b272bdd95f4a705ed45ac77e144b572a vzctl-3.0.14.ebuild 1705 -RMD160 ee294b00faa5d859ac4e13690229ead6ae2b0db5 vzctl-3.0.14.ebuild 1705 -SHA256 a087017898439444c51c6003bf61e4a9efb4b32a5f758bc187b7aa633e7f2b97 vzctl-3.0.14.ebuild 1705 -MISC ChangeLog 7411 RMD160 20c45f3568a5245c8bada27cc52f6c7b1d88b8d7 SHA1 61fcba23a8524df3aebd303c4493b26a594ac38d SHA256 efc775040eb4c9bb31e0db07bd1ebe50dd95ff7762d15462dec6526a2a4e22bc -MD5 af1a46710687999db0feaef8ed9abec9 ChangeLog 7411 -RMD160 20c45f3568a5245c8bada27cc52f6c7b1d88b8d7 ChangeLog 7411 -SHA256 efc775040eb4c9bb31e0db07bd1ebe50dd95ff7762d15462dec6526a2a4e22bc ChangeLog 7411 +EBUILD vzctl-3.0.14.ebuild 1635 RMD160 4988e8e0f08888be4a29079bcbf905f41a123c08 SHA1 41893a35933eaa7a6d8bfe696f018f7c769755bf SHA256 c683e0865dc52051991589a648e9e8d28b0f83bfdf780db4636bedb68fc24015 +MD5 ed78b3df8e864d65fa92741ca6b5a17b vzctl-3.0.14.ebuild 1635 +RMD160 4988e8e0f08888be4a29079bcbf905f41a123c08 vzctl-3.0.14.ebuild 1635 +SHA256 c683e0865dc52051991589a648e9e8d28b0f83bfdf780db4636bedb68fc24015 vzctl-3.0.14.ebuild 1635 +MISC ChangeLog 7591 RMD160 a3b4ad35d3b4a4311868ffd597d03376828d1e9c SHA1 98fd7af1a34dd1d8bea003d925112a5019cf8aec SHA256 84434135be152afcd86337d885f03e2fb3b139ee0aef29d8ca32ab24c36caa05 +MD5 9e91cb0d9b6fe4cf85f8ce3c8f475248 ChangeLog 7591 +RMD160 a3b4ad35d3b4a4311868ffd597d03376828d1e9c ChangeLog 7591 +SHA256 84434135be152afcd86337d885f03e2fb3b139ee0aef29d8ca32ab24c36caa05 ChangeLog 7591 MISC metadata.xml 231 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 SHA1 5e2b3b183660e76e9a8d93b7aeab6ce5857581c1 SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442 MD5 e5ba31c20aa49371e645a8950abd1054 metadata.xml 231 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 metadata.xml 231 @@ -49,7 +49,7 @@ SHA256 f31d206d22b741c4a7e5b5acee694512e153e1d7f8c4e61e1e9d31c9d633d611 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFr0BYyuNVb5qfaOYRAl57AKCIRXoNvoqWEOrmy3ociSQ8HvCBzgCfVnhZ -pl0h5Xw9mcFAhOavZJGP3oM= -=O4Pk +iD8DBQFFr4l8yuNVb5qfaOYRAgC8AJ9YGmsQbeLCGvdSmsFO2dKwzOE/twCcC2As +67aB4qXELDAysPTlga1evIo= +=zt8P -----END PGP SIGNATURE----- diff --git a/sys-cluster/vzctl/vzctl-3.0.14.ebuild b/sys-cluster/vzctl/vzctl-3.0.14.ebuild index 3c769d65d8df..6211dd2973cf 100644 --- a/sys-cluster/vzctl/vzctl-3.0.14.ebuild +++ b/sys-cluster/vzctl/vzctl-3.0.14.ebuild @@ -1,16 +1,16 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.14.ebuild,v 1.1 2007/01/18 09:40:03 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.14.ebuild,v 1.2 2007/01/18 14:52:10 phreak Exp $ -inherit bash-completion eutils flag-o-matic multilib +inherit bash-completion eutils -DESCRIPTION="OpenVZ VPS control utility" +DESCRIPTION="OpenVZ VE control utility" HOMEPAGE="http://openvz.org/" SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86" IUSE="bash-completion logrotate udev" RDEPEND="logrotate? ( app-admin/logrotate ) @@ -29,25 +29,25 @@ src_unpack() { } src_compile() { - econf --libdir=/usr/$(get_libdir) || die "econf failed!" - emake CFLAGS="${CFLAGS}" || die "emake failed!" + econf --localstatedir=/var \ + --enable-cron \ + $(use_enable bash-completion bashcomp) \ + $(use_enable logrotate) \ + $(use_enable udev) || die "econf failed!" + + emake || die "emake failed!" } src_install() { make DESTDIR="${D}" install install-gentoo || die "make install failed" - # Remove udev files unless USE=udev - use udev || rm -rf "${D}"/etc/udev - - # Remove the bash-completion and use dobashcompletion to install it in the - # right place! - dobashcompletion "${S}"/etc/bash_completion.d/vzctl.sh.in vzctl - - # Remove the logrotate entry unless USE=logrotate - use logrotate || rm -rf "${D}"/etc/logrotate.d + # install the bash-completion script into the right location + rm -rf "${D}"/etc/bash_completion.d + dobashcompletion "${S}"/etc/bash_completion.d/vzctl.sh vzctl } pkg_postinst() { + bash-completion_pkg_postinst if has_version "<3.0.10"; then ewarn ewarn "The location of some vzctl files have changed. Most notably," -- 2.26.2