sys-apps/checkpolicy: Mark 1.34.4 stable, clear old ebuilds, make repoman happy.

Package-Manager: portage-2.1.5_rc6

8 files changed, 23 insertions, 216 deletions

diff --git a/sys-apps/checkpolicy/ChangeLog b/sys-apps/checkpolicy/ChangeLog
index 7c731c6a4082..8b98247efdc5 100644
--- a/sys-apps/checkpolicy/ChangeLog
+++ b/sys-apps/checkpolicy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/checkpolicy
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.46 2008/01/29 15:17:17 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.47 2008/05/13 02:28:59 pebenito Exp $
+
+  13 May 2008; Chris PeBenito <pebenito@gentoo.org>
+  -files/checkpolicy-1.30.1.diff, -checkpolicy-1.28.ebuild,
+  -checkpolicy-1.30-r1.ebuild, -checkpolicy-1.34.0.ebuild,
+  -checkpolicy-1.34.3.ebuild, checkpolicy-1.34.4.ebuild:
+  Mark 1.34.4 stable, clear old ebuilds.
 
 *checkpolicy-1.34.4 (29 Jan 2008)
 
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 1374fc2ab7e6..5442539ef308 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,13 +1,14 @@
-AUX checkpolicy-1.30.1.diff 828 RMD160 2b89c0a05641613d0efad95ddbbf4a37c92a4509 SHA1 50da9bd1dad1558f891e099c153e6b1eee145368 SHA256 f2cf64bcda2b49e800693ae65093e0aa9bc85e8416fd4e5471f2af701d124186
-DIST checkpolicy-1.28.tgz 56473 RMD160 cb19f41fe9196e1db2d41eecec7f851517875d10 SHA1 eb2f810ff695b24697ac6643467fd01361fcd912 SHA256 e8e9111830b9c9e817a19fb72bdd6d393ae29e2d777f939119e95a376788523d
-DIST checkpolicy-1.30.tgz 56867 RMD160 1ce42cbc997faa3e180ea6f1a7df305ca6582192 SHA1 bee5b59529fc7c649b0be5003e3b0337d8393534 SHA256 b8b3cf0723aead2d3c3cd9ae8be20ac036dd81d5e7867f6138d477ae67944efa
-DIST checkpolicy-1.34.0.tgz 56473 RMD160 bf537ae61389487e6aa181517d5d64fd5b975cc6 SHA1 deb4bc9d7d5c1e5e95b8639c67b1f09f838f3a9d SHA256 c870534ef0c8aa5ab61fada4a8e19d4988a31e1c5023876b8db701bd13f71f06
-DIST checkpolicy-1.34.3.tgz 57101 RMD160 8bc59650714412d39522b92c6eec1cf9e7d7b24d SHA1 e3129ef88a949da6f747e06b4f40df140f4a1f0e SHA256 db2b90b0b7f8456d9e84544abdaf70c33c098d154dbe2d7e469b0f25db47a206
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST checkpolicy-1.34.4.tgz 58608 RMD160 3779d019ab3a0e73b97a44a4f4f3ac13439d28a5 SHA1 ef4ee158aa966fbb5995ae1555febf7edbfb29b2 SHA256 ce0c65955b34dd95ab9853d50f85c0af26d64cab784cb2756dc3a5df34421dc6
-EBUILD checkpolicy-1.28.ebuild 989 RMD160 e137b6c349720ff514396a29243f137dae7e3315 SHA1 356d8f8039a47afb8e7c5b249191f1017ad783fa SHA256 47c136e644c37fe071eeed13d51f18d2c263d2ecd9a398a9f70a664027ebc1c9
-EBUILD checkpolicy-1.30-r1.ebuild 852 RMD160 27e81b5d262d34364568e35f611a8eb12caf1de0 SHA1 71c1840ecaa631946f646b8e0a726f10615e2ace SHA256 185dfd72297d4b7e6d4e3a5b517c76e89de8043b91c385309b43020a95de34ae
-EBUILD checkpolicy-1.34.0.ebuild 981 RMD160 f0262a84ff8baa1eb63894e00601d3df24dca440 SHA1 641d8dd78b9819bc8d34b3466d9e98bda125640c SHA256 6947d1e8036a323f927cb024ea5e97a7004836a572f603ae921350e61982e849
-EBUILD checkpolicy-1.34.3.ebuild 995 RMD160 83213dec23a83eecf966b2f0068cdb95a259f033 SHA1 f1b3f8ba91c3e430cc72440c4e6327d15984f4c5 SHA256 c575ead360f3fe2d574d297fc750a18aaf238ae6d8137969077d067adedb38ea
-EBUILD checkpolicy-1.34.4.ebuild 987 RMD160 91def4873f1afaf56079f25712defceff638bf95 SHA1 09757d63882a3a12235fcfa701d87ae14ded5f00 SHA256 3cf7d8b86f0784b4c46a30486fd538250e26d7a68260fb011a737bd55760468f
-MISC ChangeLog 5949 RMD160 924e583ea061172f7f00a9a9e47fee92ece6642b SHA1 efa5dde2dcac609ebe4cdb01852735396dc92d65 SHA256 3e7f2fdb94d43c354ed9db0ca9a80ec37dc14776a6a902de3161640ff8a8215e
+EBUILD checkpolicy-1.34.4.ebuild 976 RMD160 d266d1685e7b647e473acd96acc1512f417c7757 SHA1 47c348c6c63995e142945ffb66fff24875153489 SHA256 61ec85b41d2cc7db1c602ae2d0146f789b81fcbf0cd2a863a4e4025496dd796c
+MISC ChangeLog 6219 RMD160 6d2d26b440592bcc3b20fd5f34ec746f7ad4880b SHA1 9ed349bcefabae500d1baf49d5eefe4370f6bfb6 SHA256 500deb39ec14284ead24c870e1918f71e6ac241fd16b0293bf4fcc847a94b787
 MISC metadata.xml 360 RMD160 4bff1b5d7190e84f7934f5b152775fc2b8e12b73 SHA1 e089234a1b02469ce1b3bae362eccd0eda835e90 SHA256 7f2dff51b3b78df07fc0b5a50f59713c51df2091150a298768bf81d2169a0fc2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgo/PAACgkQ1wYvhvBeaEZs2wCdFA8+5mT3TYtjl7z2WMKzb738
+kVEAoPEHgICyrA6uxbQAwkPFRHLDGSV6
+=ZBWc
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/checkpolicy/checkpolicy-1.28.ebuild b/sys-apps/checkpolicy/checkpolicy-1.28.ebuild
deleted file mode 100644
index ebdb03585fe1..000000000000
--- a/sys-apps/checkpolicy/checkpolicy-1.28.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.28.ebuild,v 1.6 2006/02/22 17:07:43 spb Exp $
-
-IUSE=""
-
-inherit eutils
-
-SEMNG_VER="1.4"
-
-DESCRIPTION="SELinux policy compiler"
-HOMEPAGE="http://www.nsa.gov/selinux"
-SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 mips ppc sparc x86"
-
-DEPEND="=sys-libs/libsemanage-${SEMNG_VER}*
-	sys-devel/flex
-	sys-devel/bison"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# this can probably be removed (1.28+)
-	#sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" -e 's/$(LIBS)/$(LIBS) $(LDFLAGS)/' ${S}/Makefile
-	#sed -i -e '/^lex\.yy\.c/s/\.l/\.l y\.tab\.c/' ${S}/Makefile
-}
-
-src_compile() {
-	cd ${S}
-	emake YACC="bison -y" || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	einfo "This checkpolicy can compile version `checkpolicy -V |cut -f 1 -d ' '` policy."
-}
diff --git a/sys-apps/checkpolicy/checkpolicy-1.30-r1.ebuild b/sys-apps/checkpolicy/checkpolicy-1.30-r1.ebuild
deleted file mode 100644
index 67092e0b5694..000000000000
--- a/sys-apps/checkpolicy/checkpolicy-1.30-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.30-r1.ebuild,v 1.2 2006/07/31 01:28:35 pebenito Exp $
-
-IUSE=""
-
-inherit eutils
-
-SEMNG_VER="1.6"
-
-DESCRIPTION="SELinux policy compiler"
-HOMEPAGE="http://www.nsa.gov/selinux"
-SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~mips ppc ~sparc x86"
-
-DEPEND="=sys-libs/libsemanage-${SEMNG_VER}*
-	sys-devel/flex
-	sys-devel/bison"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/checkpolicy-1.30.1.diff
-}
-
-src_compile() {
-	cd ${S}
-	emake YACC="bison -y" || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	einfo "This checkpolicy can compile version `checkpolicy -V |cut -f 1 -d ' '` policy."
-}
diff --git a/sys-apps/checkpolicy/checkpolicy-1.34.0.ebuild b/sys-apps/checkpolicy/checkpolicy-1.34.0.ebuild
deleted file mode 100644
index 6a1b70a13870..000000000000
--- a/sys-apps/checkpolicy/checkpolicy-1.34.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.34.0.ebuild,v 1.3 2007/06/04 00:46:38 pebenito Exp $
-
-IUSE="debug"
-
-inherit eutils
-
-SEMNG_VER="1.10"
-
-# BUGFIX_PATCH="${FILESDIR}/checkpolicy-1.30.4.diff"
-
-DESCRIPTION="SELinux policy compiler"
-HOMEPAGE="http://www.nsa.gov/selinux"
-SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 mips ppc sparc x86"
-
-DEPEND="=sys-libs/libsemanage-${SEMNG_VER}*
-	sys-devel/flex
-	sys-devel/bison"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	[ ! -z "${BUGFIX_PATCH}" ] && epatch "${BUGFIX_PATCH}"
-}
-
-src_compile() {
-	cd ${S}
-	emake YACC="bison -y" || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-
-	if useq debug; then
-		dobin ${S}/test/{dismod,dispol}
-	fi
-}
-
-pkg_postinst() {
-	einfo "This checkpolicy can compile version `checkpolicy -V |cut -f 1 -d ' '` policy."
-}
diff --git a/sys-apps/checkpolicy/checkpolicy-1.34.3.ebuild b/sys-apps/checkpolicy/checkpolicy-1.34.3.ebuild
deleted file mode 100644
index 4ab7689b5944..000000000000
--- a/sys-apps/checkpolicy/checkpolicy-1.34.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.34.3.ebuild,v 1.1 2007/10/18 19:34:58 pebenito Exp $
-
-IUSE="debug"
-
-inherit eutils
-
-SEMNG_VER="1.10"
-
-# BUGFIX_PATCH="${FILESDIR}/checkpolicy-1.30.4.diff"
-
-DESCRIPTION="SELinux policy compiler"
-HOMEPAGE="http://www.nsa.gov/selinux"
-SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
-
-DEPEND="=sys-libs/libsemanage-${SEMNG_VER}*
-	sys-devel/flex
-	sys-devel/bison"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	[ ! -z "${BUGFIX_PATCH}" ] && epatch "${BUGFIX_PATCH}"
-}
-
-src_compile() {
-	cd "${S}"
-	emake YACC="bison -y" || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-
-	if useq debug; then
-		dobin "${S}/test/{dismod,dispol}"
-	fi
-}
-
-pkg_postinst() {
-	einfo "This checkpolicy can compile version `checkpolicy -V |cut -f 1 -d ' '` policy."
-}
diff --git a/sys-apps/checkpolicy/checkpolicy-1.34.4.ebuild b/sys-apps/checkpolicy/checkpolicy-1.34.4.ebuild
index b23f7f3948ac..2419e4666cf6 100644
--- a/sys-apps/checkpolicy/checkpolicy-1.34.4.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-1.34.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.34.4.ebuild,v 1.1 2008/01/29 15:17:17 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.34.4.ebuild,v 1.2 2008/05/13 02:28:59 pebenito Exp $
 
 IUSE="debug"
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.nsa.gov/selinux"
 SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 mips ppc sparc x86"
 
 DEPEND="=sys-libs/libsemanage-${SEMNG_VER}*
 	sys-devel/flex
@@ -23,13 +23,12 @@ DEPEND="=sys-libs/libsemanage-${SEMNG_VER}*
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	[ ! -z "${BUGFIX_PATCH}" ] && epatch "${BUGFIX_PATCH}"
 }
 
 src_compile() {
-	cd ${S}
 	emake YACC="bison -y" || die
 }
 
@@ -37,7 +36,7 @@ src_install() {
 	make DESTDIR="${D}" install
 
 	if useq debug; then
-		dobin ${S}/test/{dismod,dispol}
+		dobin "${S}/test/{dismod,dispol}"
 	fi
 }
 
diff --git a/sys-apps/checkpolicy/files/checkpolicy-1.30.1.diff b/sys-apps/checkpolicy/files/checkpolicy-1.30.1.diff
deleted file mode 100644
index 1ffbbdc2ab9e..000000000000
--- a/sys-apps/checkpolicy/files/checkpolicy-1.30.1.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: module_compiler.c
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-usr/checkpolicy/module_compiler.c,v
-retrieving revision 1.13
-retrieving revision 1.14
-diff -u -r1.13 -r1.14
---- a/module_compiler.c	13 Feb 2006 15:12:06 -0000	1.13
-+++ b/module_compiler.c	22 Mar 2006 20:51:23 -0000	1.14
-@@ -702,7 +702,7 @@
-         char *id = queue_remove(id_queue);
-         role_datum_t *role = NULL;
-         int retval;
--        if (pass == 2) {
-+        if (pass == 1) {
-                 free(id);
-                 return 0;
-         }
-@@ -816,7 +816,7 @@
-         char *id = queue_remove(id_queue);
-         user_datum_t *user = NULL;
-         int retval;
--        if (pass == 2) {
-+        if (pass == 1) {
-                 free(id);
-                 return 0;
-         }