From 19ba9aca7cbb3601f5096c8691677a479894d906 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 2 Nov 2011 22:44:19 +0000 Subject: [PATCH] Clean up ebuild, and use enewgroup instead of groupadd. Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64 --- dev-util/mock/ChangeLog | 8 ++++++-- dev-util/mock/Manifest | 18 ++++++++---------- dev-util/mock/mock-0.9.10-r1.ebuild | 22 ++++++++++------------ dev-util/mock/mock-0.9.10-r2.ebuild | 15 ++++++--------- dev-util/mock/mock-0.9.10.ebuild | 22 ++++++++++------------ dev-util/mock/mock-1.0.3.ebuild | 15 ++++++--------- 6 files changed, 46 insertions(+), 54 deletions(-) diff --git a/dev-util/mock/ChangeLog b/dev-util/mock/ChangeLog index d5042cf303af..cda3d8c7845d 100644 --- a/dev-util/mock/ChangeLog +++ b/dev-util/mock/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/mock -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/mock/ChangeLog,v 1.8 2010/08/08 15:02:32 jmbsvicetto Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/mock/ChangeLog,v 1.9 2011/11/02 22:44:19 vapier Exp $ + + 02 Nov 2011; Mike Frysinger mock-0.9.10.ebuild, + mock-0.9.10-r1.ebuild, mock-0.9.10-r2.ebuild, mock-1.0.3.ebuild: + Clean up ebuild, and use enewgroup instead of groupadd. 08 Aug 2010; Jorge Manuel B. S. Vicetto metadata.xml: diff --git a/dev-util/mock/Manifest b/dev-util/mock/Manifest index dce9eaaaa565..4d133668b42a 100644 --- a/dev-util/mock/Manifest +++ b/dev-util/mock/Manifest @@ -4,18 +4,16 @@ Hash: SHA256 AUX mock-0.9.10-chroot-fix.patch 591 RMD160 815bf6040991348244a9fa71927371142d699a81 SHA1 0949f45a47cb8c1f36bb52532b01786be45dec10 SHA256 1af4b45640aa957cb02675bf2fa29ecb2a5cbf7aeeb69fe12a90106a2701a06e DIST mock-0.9.10.tar.gz 147687 RMD160 b7705f75de43f5c2f3ed3f599aac074da27bde21 SHA1 317ac3ad9cb03f71923b3d7e91738dbe150482d9 SHA256 5d9919435310e86c5a91acd22726a3091eea7705470e8b7d903ebd8413fd3839 DIST mock-1.0.3.tar.gz 237654 RMD160 25bdeab59f7ad10df56da50a6975309203c6dcf2 SHA1 398acffbf15d2bdbdf8afd34d9ae6bc47b2998f0 SHA256 7b0c29920f97d4cf51d9f29eb4728e514eadfefea3b8d9888f228bc91f97eb54 -EBUILD mock-0.9.10-r1.ebuild 810 RMD160 2acddf149ca078cd4218864312cd62b6e3701a61 SHA1 457a831a0f0f4ddc5f7d68e021c6a8821ed32cd9 SHA256 98d41c490889944d5d5161b78f18b62894a5acf7dad990f6d05f6f599f87f029 -EBUILD mock-0.9.10-r2.ebuild 869 RMD160 bf54038fa80d21bc2c92efdc679955832bc79508 SHA1 de3bc485a9acf158133525ab87d4cc108e82cba4 SHA256 133ec7bcd051660a03181af5e9574853f5f7cce22980288ce10d531fa7a7ad9b -EBUILD mock-0.9.10.ebuild 797 RMD160 c75d1bc9da5212f316010ff99aad3881a682751b SHA1 b76e6cd85089fcde22698416123c1bf36a87d6bd SHA256 183a52eafff742924072df6effd9b52429b3346467d044551b8ce587c51d04f7 -EBUILD mock-1.0.3.ebuild 804 RMD160 069ba04549694ad4738f1516eac9ad70f0f8f365 SHA1 bb3277f55af5e56d529814bf7966ed3ffff9a926 SHA256 e728ff4cd80a215c99f5cfb59d0683f76562cc595d90cc10b000f2e4bdb9593b -MISC ChangeLog 1259 RMD160 077a1241ab361335dc371251a969ce44ce7a9cd3 SHA1 ae16dbf6e45b6495bac1c172f022a96b27ab8901 SHA256 2b5a8c83e0cb338c0f3ac969e445d26b4bf8f616eb377fbf25b7fc6319af6e73 +EBUILD mock-0.9.10-r1.ebuild 706 RMD160 2eeb918475e5b346f0b2c1ec43bb2c4335b93884 SHA1 9dc2b3220ef151403b3ea89c004faaec6cfc0d94 SHA256 1a58c6f36686e68bbc11b9014ef29c35866f3c36e7ff9ab3f38d1e8b7fa95ced +EBUILD mock-0.9.10-r2.ebuild 769 RMD160 b3df3d2c3667c33beab5ed472d8de679c9d9edcb SHA1 d2304f37994286ad2fa0a8decabb8ca2d6fd94fd SHA256 64121ec452b7f71bb8e547fcae323cd1a55d945c9453296b314c68ec927f324f +EBUILD mock-0.9.10.ebuild 703 RMD160 1d6476910c38a2b87f69c7b45e4e35cc79e17219 SHA1 3c84ba55661831c7a0510c0f0fdfa39a4ba97ea3 SHA256 4f55424449a2357bb7661ff38c4267cb3ebeea3c58d534bfb3a5e8730204cbc8 +EBUILD mock-1.0.3.ebuild 702 RMD160 51ced7675d7f7458842ca8f29a6659dabfdad25c SHA1 d096633a531eb1a851b7a8af2619cce906a02717 SHA256 e6b4ace2dc94fc5b1d804ce4950364f0cba30cde10f2c7e55e92a05446d8f3f5 +MISC ChangeLog 1450 RMD160 dc136ba430c0c2a65c6a80c964ac9610dea11600 SHA1 d79b1248d5a6946e2a29457a140dc0ee7d395fc5 SHA256 d5e8728d72d4da8b512131bc2264abdaf63af76c768da354d7421a3dc7e5f751 MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQEIAAYFAk59m5AACgkQfXuS5UK5QB3SEgP/UxWmxTQHYw66HYgUFoxpkksh -TWYNqBsM2vyArppPjDydD9xVH/sfa2jCG7wBt87wdTyZ3rEUrI4AkdR44tvxmuEX -saUvh7iih5fhDMoUynkG29oyDvBRXosIhP/Q2uvo42zpgA6KIGIRQJe7dedST8U7 -1oDAT5GJkLwyi1UlT+Y= -=wgMD +iF4EAREIAAYFAk6xx88ACgkQaC/OocHi7JZhlAD/Ty/ybLU+kKoQSdxEZIPUOflB +fKmnf4XN1mQi0pFvB6QA/isLH6+CIynVmjLBhmtXlb+vvqgNSHdaMbOMHNhTKd8X +=i7Uu -----END PGP SIGNATURE----- diff --git a/dev-util/mock/mock-0.9.10-r1.ebuild b/dev-util/mock/mock-0.9.10-r1.ebuild index 0f570609de3e..453fa64d5926 100644 --- a/dev-util/mock/mock-0.9.10-r1.ebuild +++ b/dev-util/mock/mock-0.9.10-r1.ebuild @@ -1,30 +1,28 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/mock/mock-0.9.10-r1.ebuild,v 1.2 2009/03/27 18:06:43 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/mock/mock-0.9.10-r1.ebuild,v 1.3 2011/11/02 22:44:19 vapier Exp $ -DESCRIPTION="Mock creates chroots and builds packages in them for Fedora and -RedHat." +EAPI="2" + +inherit eutils + +DESCRIPTION="create chroots and build packages in them for Fedora and RedHat" HOMEPAGE="http://fedoraproject.org/wiki/Projects/Mock" SRC_URI="https://fedorahosted.org/mock/attachment/wiki/MockTarballs/mock-${PV}.tar.gz?format=raw -> mock-${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~amd64" +KEYWORDS="~amd64 ~x86" IUSE="" -EAPI="2" - DEPEND="" RDEPEND="sys-apps/yum dev-python/decoratortools" src_install() { - emake DESTDIR="${D}" install || die "install failed" + emake DESTDIR="${D}" install || die } pkg_postinst() { - if ! [[ $(grep -q mock /etc/group && echo $?) ]]; then - einfo "Creating group 'mock'" - groupadd mock - fi + enewgroup mock } diff --git a/dev-util/mock/mock-0.9.10-r2.ebuild b/dev-util/mock/mock-0.9.10-r2.ebuild index 8b37a6fbf722..3d62fd5493ef 100644 --- a/dev-util/mock/mock-0.9.10-r2.ebuild +++ b/dev-util/mock/mock-0.9.10-r2.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/mock/mock-0.9.10-r2.ebuild,v 1.3 2009/10/12 07:53:20 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/mock/mock-0.9.10-r2.ebuild,v 1.4 2011/11/02 22:44:19 vapier Exp $ + +EAPI="2" -EAPI=2 inherit eutils -DESCRIPTION="Mock creates chroots and builds packages in them for Fedora and -RedHat." +DESCRIPTION="create chroots and build packages in them for Fedora and RedHat" HOMEPAGE="http://fedoraproject.org/wiki/Projects/Mock" SRC_URI="https://fedorahosted.org/mock/attachment/wiki/MockTarballs/mock-${PV}.tar.gz?format=raw -> mock-${PV}.tar.gz" @@ -28,8 +28,5 @@ src_install() { } pkg_postinst() { - if ! [[ $(grep -q mock /etc/group && echo $?) ]]; then - einfo "Creating group 'mock'" - groupadd mock - fi + enewgroup mock } diff --git a/dev-util/mock/mock-0.9.10.ebuild b/dev-util/mock/mock-0.9.10.ebuild index 067d61d66b49..5b3267d7c259 100644 --- a/dev-util/mock/mock-0.9.10.ebuild +++ b/dev-util/mock/mock-0.9.10.ebuild @@ -1,30 +1,28 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/mock/mock-0.9.10.ebuild,v 1.5 2009/03/27 18:06:43 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/mock/mock-0.9.10.ebuild,v 1.6 2011/11/02 22:44:19 vapier Exp $ -DESCRIPTION="Mock creates chroots and builds packages in them for Fedora and -RedHat." +EAPI="2" + +inherit eutils + +DESCRIPTION="create chroots and build packages in them for Fedora and RedHat" HOMEPAGE="http://fedoraproject.org/wiki/Projects/Mock" SRC_URI="https://fedorahosted.org/mock/attachment/wiki/MockTarballs/mock-${PV}.tar.gz?format=raw -> mock-${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~amd64" +KEYWORDS="~amd64 ~x86" IUSE="" -EAPI="2" - DEPEND="" RDEPEND="sys-apps/yum dev-python/decoratortools" src_install() { - emake DESTDIR="${D}" install || die "install failed" + emake DESTDIR="${D}" install || die } pkg_postinst() { - if [[ ! $(egrep -q mock /etc/group) ]]; then - einfo "Creating group `mock`" - groupadd mock - fi + enewgroup mock } diff --git a/dev-util/mock/mock-1.0.3.ebuild b/dev-util/mock/mock-1.0.3.ebuild index fbbcf23f0a26..f21a80102601 100644 --- a/dev-util/mock/mock-1.0.3.ebuild +++ b/dev-util/mock/mock-1.0.3.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/mock/mock-1.0.3.ebuild,v 1.1 2010/02/19 11:37:47 deathwing00 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/mock/mock-1.0.3.ebuild,v 1.2 2011/11/02 22:44:19 vapier Exp $ + +EAPI="2" -EAPI=2 inherit eutils -DESCRIPTION="Mock creates chroots and builds packages in them for Fedora and -RedHat." +DESCRIPTION="create chroots and build packages in them for Fedora and RedHat" HOMEPAGE="http://fedoraproject.org/wiki/Projects/Mock" SRC_URI="https://fedorahosted.org/mock/attachment/wiki/MockTarballs/mock-${PV}.tar.gz?format=raw -> mock-${PV}.tar.gz" @@ -24,8 +24,5 @@ src_install() { } pkg_postinst() { - if ! [[ $(grep -q mock /etc/group && echo $?) ]]; then - einfo "Creating group 'mock'" - groupadd mock - fi + enewgroup mock } -- 2.26.2