mark stable

6 files changed, 8 insertions, 65 deletions

diff --git a/sys-apps/checkpolicy/ChangeLog b/sys-apps/checkpolicy/ChangeLog
index cc046547020d..9ef57955986d 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.7 2003/10/03 16:43:33 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.8 2003/10/07 18:19:40 pebenito Exp $
+
+  07 Oct 2003; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.2.ebuild:
+  Mark stable.
 
 *checkpolicy-1.2 (03 Oct 2003)
 
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 37ffd564c803..871d1bed603b 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,8 +1,5 @@
-MD5 0b74645590983be7a41d32b71dc662d6 checkpolicy-1.1.ebuild 726
 MD5 927093fd813bc45afc77ef11c9258e91 metadata.xml 360
-MD5 be888bd5b1d75eb47018266438b852c6 ChangeLog 1244
-MD5 cfb7b7977d7d2d25852c6576df71958b checkpolicy-1.2.ebuild 728
-MD5 ddd219db4d3ce78053d66ce9d8ab8fcd files/digest-checkpolicy-1.1 63
-MD5 afa3bf2d650b8102690fb12eaff327b0 files/checkpolicy-1.0-gentoo.diff 584
+MD5 0cfebc8a0fcbd0c037795789a77288e3 ChangeLog 1336
+MD5 5aaf331dbdc96e64e3064c932b60a6ac checkpolicy-1.2.ebuild 726
 MD5 34336f141d0ccf89f3d58a10ca156287 files/digest-checkpolicy-1.2 63
 MD5 3353293995a661930e43915541e9a99c files/checkpolicy-1.2-gentoo.diff 573
diff --git a/sys-apps/checkpolicy/checkpolicy-1.1.ebuild b/sys-apps/checkpolicy/checkpolicy-1.1.ebuild
deleted file mode 100644
index edad234b6beb..000000000000
--- a/sys-apps/checkpolicy/checkpolicy-1.1.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.1.ebuild,v 1.3 2003/09/23 04:22:09 pebenito 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"
-
-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.0-gentoo.diff
-}
-
-src_compile() {
-	cd ${S}
-	emake EXTRA_CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-}
diff --git a/sys-apps/checkpolicy/checkpolicy-1.2.ebuild b/sys-apps/checkpolicy/checkpolicy-1.2.ebuild
index 488f9f53b959..6324f104ce76 100644
--- a/sys-apps/checkpolicy/checkpolicy-1.2.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-1.2.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.2.ebuild,v 1.1 2003/10/03 16:43:33 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.2.ebuild,v 1.2 2003/10/07 18:19:40 pebenito Exp $
 
 IUSE=""
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.nsa.gov/selinux"
 SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 
 DEPEND="sys-devel/flex
 	sys-devel/bison"
diff --git a/sys-apps/checkpolicy/files/checkpolicy-1.0-gentoo.diff b/sys-apps/checkpolicy/files/checkpolicy-1.0-gentoo.diff
deleted file mode 100644
index 9031d4713a71..000000000000
--- a/sys-apps/checkpolicy/files/checkpolicy-1.0-gentoo.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urN checkpolicy-1.0.orig/Makefile checkpolicy-1.0/Makefile
---- checkpolicy-1.0.orig/Makefile	2003-07-07 07:52:08.000000000 -0500
-+++ checkpolicy-1.0/Makefile	2003-08-03 20:36:52.000000000 -0500
-@@ -4,13 +4,15 @@
- PREFIX ?= ${DESTDIR}/usr
- BINDIR ?= $(PREFIX)/bin
- 
--CFLAGS = -g -Wall -O2 -pipe
-+CFLAGS = -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.1 b/sys-apps/checkpolicy/files/digest-checkpolicy-1.1
deleted file mode 100644
index 9bb89a846455..000000000000
--- a/sys-apps/checkpolicy/files/digest-checkpolicy-1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4041cb38e3ac59d0450493de9137ae69 checkpolicy-1.1.tgz 67704