inherit user for enewgroup and enewuser, and eliminate duplication in inherit lines

Package-Manager: portage-2.2.0_alpha108_p12/cvs/Linux i686

7 files changed, 31 insertions, 27 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 043ec8d19898..0d660d6acb05 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.484 2012/05/24 21:37:03 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.485 2012/06/01 04:19:51 zmedico Exp $
+
+  01 Jun 2012; Zac Medico <zmedico@gentoo.org> cups-1.4.8-r1.ebuild,
+  cups-1.4.8-r23.ebuild, cups-1.5.2-r21.ebuild, cups-1.5.2-r4.ebuild,
+  cups-9999.ebuild:
+  inherit user for enewgroup and enewuser, and eliminate duplication in inherit
+  lines
 
   24 May 2012; Johannes Huber <johu@gentoo.org> cups-1.5.2-r4.ebuild:
   Stable for x86, wrt bug #411887
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 368752b0d923..cae4f0c28a49 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX cups-1.4.0-backend-https.patch 483 RMD160 b338f67ebf0719b5e12eaa8490affbd7a1bb8c0e SHA1 bfeadba67792203d654a64bdec16f3d2a31aeca6 SHA256 9060a5d848d6655db4629822d01fd772a3fbe1a5107109c50cb0ecb4de7a9526
 AUX cups-1.4.2-str3200.patch 1654 RMD160 cc40d26f7e9dbe5a12d9426535d09de10254da26 SHA1 b330108bcfb8ca3ab5d6dd3b48dc3d2937c7bca1 SHA256 8a64f5c72d64ecd95d330fd90630eb02a67865c07921ecb0c010e84b49b537e0
@@ -26,21 +26,17 @@ DIST cups-1.5.2-avahi.patch.bz2 17252 RMD160 40c7165de7f23e01aa3edf3968406e69fd0
 DIST cups-1.5.2-ipp-r8950.patch.bz2 19525 RMD160 346a3141ae445dc9f17c7fbc0a467aea4910f10b SHA1 4bc3b40771261c37b63cbe4f65213b5db6c66534 SHA256 1a2d36136fc66b5f53e7cfb3e5d815e62cc3a6b4cc61d678f29d8a0bb748572a
 DIST cups-1.5.2-locales.patch.xz 313616 RMD160 2346f911910c19364fc67c67c22b4d7583efe616 SHA1 b3f2660affd00d6a505beeccfb1280275197bd49 SHA256 273f3583882533ce995a0d3380d6db1b5aedb88790def799c38a3454c84357eb
 DIST cups-1.5.2-source.tar.bz2 9595665 RMD160 98181e2ee8c6e574fb6d405f688f52c9b61a2355 SHA1 56fdb4f58e676607845321c0296c1e90e416883f SHA256 b150aa108c631f4f07e92cb13c01263a67170e5ac8383c5548ef8f8473a187fb
-EBUILD cups-1.4.8-r1.ebuild 7238 RMD160 bcaea5c73607b67db0ddf167028e478e570bb1d2 SHA1 90cea0976ff93ffe3a92e45a028325fe07d34a7d SHA256 36349d5f86ca76fe70935acf172bb166515b4f56d403f39dd3016c49b25ed862
-EBUILD cups-1.4.8-r23.ebuild 8848 RMD160 0346363cf60979a04b7e626c396b8f558c47e868 SHA1 85dea1ec0d908183257675ac4748ceec57f7f72b SHA256 767556a6135e68aeaff967599dab0a6716c1d8cd0d1309ac8d8f12eadd118646
-EBUILD cups-1.5.2-r21.ebuild 8951 RMD160 efa5b5787cb2ba8f4b6173409f59da1eff5f73bf SHA1 526e38ac91a0814d7fa1e6bca7c1a8a91fd00ab5 SHA256 96cee6cb623716bb528a23210820c5e7ccc502caff673fa4bee6e60571967d95
-EBUILD cups-1.5.2-r4.ebuild 8323 RMD160 5727ee45f94849fad2e1c4094db8a244c7414b9d SHA1 a4127e02f7d31cb1e3ff45850ce0e4fc7baea12f SHA256 96ee6a18b244720d693cbdb8208b814374b66a107a2d0f56af21b1857f5c0e60
-EBUILD cups-9999.ebuild 7788 RMD160 340f2ed69464e0e73807b2e07a82bccd651e05b3 SHA1 3bdb4e91823fd75512a2044527b08a1c09e2a811 SHA256 5eeef201ec6fec709637dfdd07c24f49ff5e743a94c7dd7ad36d5ee8577ee673
-MISC ChangeLog 73600 RMD160 4052a11a2a6ddca4bf99f4312ceba525dec6fff6 SHA1 e6e916d523546016ac45f80ae9a3f24ffba2d5f8 SHA256 9fb01df2739d55e4384af13456fd24446f8f11bc998984058514a543f8fc75d9
+EBUILD cups-1.4.8-r1.ebuild 7244 RMD160 a1c15926b837ec497fe496a7f0f9051a0de8d923 SHA1 4068757755bb1b9d7e5a7057e041238232d458c7 SHA256 36ab04f13134fdc205b2ca137473e9489fd4dfd1cd0046362d94fbeecffa920a
+EBUILD cups-1.4.8-r23.ebuild 8854 RMD160 b84a4dbe91f91f012f457d2436e44a69c1f78727 SHA1 7bf8931ed2731b5600aeb70f78dd06dbdace0dbc SHA256 901288e3a86de7a3f2d797c63e20086da01c01141f63ac4b531281c3273ee587
+EBUILD cups-1.5.2-r21.ebuild 8826 RMD160 5f18a992b36f0eabc3e644f96cbff42a2adf5228 SHA1 e3f3732d6a29b03131d878bb162abb437c1829c5 SHA256 f0c8b7b022b1989845f7cb3b7b412ffbdeff4006332d25fb9bf120b5c01c9487
+EBUILD cups-1.5.2-r4.ebuild 8331 RMD160 90cfea788dea3d15ae896fe7cb79a2d6de47b267 SHA1 e3b70a5022f02593781112cb54f15fc9d226ce69 SHA256 073f73dd2344da4affcb8bc190a40aa019a69794d35787797c5890266004cc28
+EBUILD cups-9999.ebuild 7675 RMD160 1302b75fcd0e7ebc6ba72d4cfdc6d96d3b94993d SHA1 617e7b962ab49d0dcdd3e766058ae0ef26f46b95 SHA256 cd5a978703267c22aca40bb6e6a00c809fa806c00727dc274d25387cdccafccd
+MISC ChangeLog 73851 RMD160 9d964277634e87453105716f32049292ac5d2b48 SHA1 d8f9d11e9c125ce442b0a3b246ab95c05b0b50e7 SHA256 59e9993bb2d3f19d5c0e14a60b63a7ade429672a03331ed8952706653dcd7d4c
 MISC metadata.xml 778 RMD160 39d95458b469079b683adf4f2e79eb0b803ce0b9 SHA1 62b298bb9c5435716ce81550213ccd086ec065aa SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPvqoHAAoJEO+t9ga+3I3a5ZQH/1chPE0/PEviTWRTkuWOMREj
-VubBGA3MmxuSk0TWZiAuVNFdwDKzizKCctFaFtrRg48J5LPOr05EntkOw2l+KW0Q
-o8V6+zaiEL62QbLShIq4gENQNnAtMBvrZzXTHs2eWA3UJtfwm06uSEniEQRf27rh
-6wReOonxbJas7/Q/pMKAsej/wrPZo2x3BAkSLEF0KHwFxP1neuEo+YVihumVAKSG
-+W5UxaicPpWr6fKPzzk/bB7UW9nOKtlZVW8+LOP5vaDxBlOc+Qm6pZ961ziQZuYe
-cbsTLX1Y9vvr5L4OM7AqhO+ai2unAXm0OxdqSTGLwObJ0/2r7WSrYC2wNUXULYY=
-=uAhQ
+iEYEARECAAYFAk/IQu8ACgkQ/ejvha5XGaOIPACgpeVc7hAw3lrGJuAjQ1ZdwdId
+e08An2LJrBhYXmpMXqUSgMsFZ3O1CIYY
+=Uze6
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.4.8-r1.ebuild b/net-print/cups/cups-1.4.8-r1.ebuild
index 67d3e4f97db4..ea7b850b61d2 100644
--- a/net-print/cups/cups-1.4.8-r1.ebuild
+++ b/net-print/cups/cups-1.4.8-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild,v 1.12 2012/05/03 07:22:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild,v 1.13 2012/06/01 04:19:51 zmedico Exp $
 
 EAPI=3
 
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit autotools eutils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
+inherit autotools eutils flag-o-matic linux-info multilib pam perl-module python versionator user java-pkg-opt-2
 
 MY_P=${P/_}
 
diff --git a/net-print/cups/cups-1.4.8-r23.ebuild b/net-print/cups/cups-1.4.8-r23.ebuild
index 1c46edb2581f..f09c2e99b849 100644
--- a/net-print/cups/cups-1.4.8-r23.ebuild
+++ b/net-print/cups/cups-1.4.8-r23.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r23.ebuild,v 1.6 2012/05/03 07:22:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r23.ebuild,v 1.7 2012/06/01 04:19:51 zmedico Exp $
 
 EAPI=3
 
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
+inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2
 
 MY_P=${P/_}
 
diff --git a/net-print/cups/cups-1.5.2-r21.ebuild b/net-print/cups/cups-1.5.2-r21.ebuild
index f54753b789cb..06d69fb8c515 100644
--- a/net-print/cups/cups-1.5.2-r21.ebuild
+++ b/net-print/cups/cups-1.5.2-r21.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r21.ebuild,v 1.4 2012/05/21 22:25:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r21.ebuild,v 1.5 2012/06/01 04:19:51 zmedico Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="python? 2:2.5"
 
+inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2 systemd
+
 MY_P=${P/_}
 MY_PV=${PV/_}
 
 if [[ "${PV}" != "9999" ]]; then
-	inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2 systemd
 	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2
 		http://dev.gentoo.org/~dilfridge/distfiles/${P}-ipp-r8950.patch.bz2
 		http://dev.gentoo.org/~dilfridge/distfiles/${P}-avahi.patch.bz2
@@ -18,7 +19,7 @@ if [[ "${PV}" != "9999" ]]; then
 	"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
 else
-	inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2 systemd subversion
+	inherit subversion
 	ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
 	KEYWORDS=""
 fi
diff --git a/net-print/cups/cups-1.5.2-r4.ebuild b/net-print/cups/cups-1.5.2-r4.ebuild
index b6e081a37fb6..151d6a6d64e2 100644
--- a/net-print/cups/cups-1.5.2-r4.ebuild
+++ b/net-print/cups/cups-1.5.2-r4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.12 2012/05/24 21:37:03 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.13 2012/06/01 04:19:51 zmedico Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
+inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2
 
 MY_P=${P/_}
 MY_PV=${PV/_}
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index d8cb97306775..df688ec4fdc2 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.6 2012/05/21 22:25:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.7 2012/06/01 04:19:51 zmedico Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="python? 2:2.5"
 
+inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python user versionator java-pkg-opt-2 systemd
+
 MY_P=${P/_}
 MY_PV=${PV/_}
 
 if [[ "${PV}" != "9999" ]]; then
-	inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python versionator java-pkg-opt-2 systemd
 	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
 else
-	inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python versionator java-pkg-opt-2 systemd subversion
+	inherit subversion
 	ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
 	KEYWORDS=""
 fi