mark stable

6 files changed, 10 insertions, 68 deletions

diff --git a/sys-apps/checkpolicy/ChangeLog b/sys-apps/checkpolicy/ChangeLog
index cb13fd3eef32..8a4190671d79 100644
--- a/sys-apps/checkpolicy/ChangeLog
+++ b/sys-apps/checkpolicy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/checkpolicy
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.10 2003/12/06 20:16:49 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.11 2003/12/16 20:36:36 pebenito Exp $
+
+  16 Dec 2003; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.4.ebuild:
+  Mark stable.
 
 *checkpolicy-1.4 (06 Dec 2003)
 
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 0507e6437984..b1fe8ec617f5 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,7 +1,4 @@
-MD5 eae13956b283cafd955846ab78450c00 checkpolicy-1.2.ebuild 737
-MD5 34336f141d0ccf89f3d58a10ca156287 files/digest-checkpolicy-1.2 63
-MD5 344c1bdea2908053273f77fb584a7074 files/digest-checkpolicy-1.4 63
-MD5 3353293995a661930e43915541e9a99c files/checkpolicy-1.2-gentoo.diff 573
-MD5 c6d92b48bfe1c918a4a5affb2bf78362 checkpolicy-1.4.ebuild 739
-MD5 5ad7c16ba0ef898c39584ba07fb1f1b9 ChangeLog 1559
+MD5 37fd323939a3f45abf0375f1711fb300 checkpolicy-1.4.ebuild 725
 MD5 927093fd813bc45afc77ef11c9258e91 metadata.xml 360
+MD5 f99b80a8acef1dc4dba38c10609078f4 ChangeLog 1651
+MD5 344c1bdea2908053273f77fb584a7074 files/digest-checkpolicy-1.4 63
diff --git a/sys-apps/checkpolicy/checkpolicy-1.2.ebuild b/sys-apps/checkpolicy/checkpolicy-1.2.ebuild
deleted file mode 100644
index e0b37dc62846..000000000000
--- a/sys-apps/checkpolicy/checkpolicy-1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.2.ebuild,v 1.4 2003/10/29 16:08:39 method Exp $
-
-IUSE=""
-
-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="x86 ppc sparc"
-
-DEPEND="sys-devel/flex
-	sys-devel/bison"
-
-RDEPEND="${DEPEND}
-	sec-policy/selinux-base-policy"
-
-S=${WORKDIR}/${P}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2-gentoo.diff
-}
-
-src_compile() {
-	cd ${S}
-	emake EXTRA_CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-}
diff --git a/sys-apps/checkpolicy/checkpolicy-1.4.ebuild b/sys-apps/checkpolicy/checkpolicy-1.4.ebuild
index e8f997c3f15d..e416be6c9533 100644
--- a/sys-apps/checkpolicy/checkpolicy-1.4.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.4.ebuild,v 1.1 2003/12/06 20:16:49 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.4.ebuild,v 1.2 2003/12/16 20:36:36 pebenito Exp $
 
 IUSE=""
 
@@ -9,13 +9,12 @@ HOMEPAGE="http://www.nsa.gov/selinux"
 SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc"
 
 DEPEND="sys-devel/flex
 	sys-devel/bison"
 
-RDEPEND="${DEPEND}
-	sec-policy/selinux-base-policy"
+RDEPEND="sec-policy/selinux-base-policy"
 
 S=${WORKDIR}/${P}
 
diff --git a/sys-apps/checkpolicy/files/checkpolicy-1.2-gentoo.diff b/sys-apps/checkpolicy/files/checkpolicy-1.2-gentoo.diff
deleted file mode 100644
index 392b738f923a..000000000000
--- a/sys-apps/checkpolicy/files/checkpolicy-1.2-gentoo.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urN checkpolicy-1.2.orig/Makefile checkpolicy-1.2/Makefile
---- checkpolicy-1.2.orig/Makefile	2003-09-11 15:57:56.000000000 -0500
-+++ checkpolicy-1.2/Makefile	2003-10-02 14:06:42.000000000 -0500
-@@ -16,13 +16,15 @@
- OBJS =
- endif
- 
--CFLAGS = -g $(OPTIONS) -Wall -O2 -pipe
-+CFLAGS = $(OPTIONS) -Wall $(EXTRA_CFLAGS)
- override CFLAGS += -include global.h -I. -Iinclude
- 
- OBJS += ebitmap.o hashtab.o symtab.o sidtab.o avtab.o policydb.o services.o y.tab.o lex.yy.o queue.o write.o checkpolicy.o
- 
- LIBS=-lfl
- 
-+YACC=bison -y
-+
- all:  checkpolicy
- 
- checkpolicy: $(OBJS)
diff --git a/sys-apps/checkpolicy/files/digest-checkpolicy-1.2 b/sys-apps/checkpolicy/files/digest-checkpolicy-1.2
deleted file mode 100644
index 825b3ccc30d7..000000000000
--- a/sys-apps/checkpolicy/files/digest-checkpolicy-1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fd6f05ce08bd5388cf1abed63b1ae970 checkpolicy-1.2.tgz 68297