Drop old, add prefix keywords

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

4 files changed, 10 insertions, 102 deletions

diff --git a/media-libs/qhull/ChangeLog b/media-libs/qhull/ChangeLog
index feb1b5953292..d1b99113bd87 100644
--- a/media-libs/qhull/ChangeLog
+++ b/media-libs/qhull/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/qhull
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/ChangeLog,v 1.43 2011/06/28 19:59:33 ranger Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/ChangeLog,v 1.44 2012/01/14 10:36:56 xarthisius Exp $
+
+  14 Jan 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  -files/qhull-2003.1-makefile.patch, -qhull-2003.1-r1.ebuild,
+  qhull-2010.1-r2.ebuild:
+  Drop old, add prefix keywords
 
   28 Jun 2011; Brent Baude <ranger@gentoo.org> qhull-2010.1-r2.ebuild:
   Marking qhull-2010.1-r2 ppc for bug 345279
diff --git a/media-libs/qhull/files/qhull-2003.1-makefile.patch b/media-libs/qhull/files/qhull-2003.1-makefile.patch
deleted file mode 100644
index 7879f41045d4..000000000000
--- a/media-libs/qhull/files/qhull-2003.1-makefile.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/Makefile	2001-02-12 03:26:08.000000000 +0100
-+++ b//Makefile	2005-02-22 22:00:15.077553880 +0100
-@@ -78,7 +78,7 @@
- 		qh-poly.htm qh-qhull.htm qh-set.htm qh-stat.htm qh-user.htm \
- 		qdelau_f.htm qhalf.htm qvoronoi.htm qvoron_f.htm rbox.htm 
- 
--all: rbox qconvex qdelaunay qhalf qvoronoi qhull
-+all: rbox qconvex qdelaunay qhalf qvoronoi qhull libqhull.so
- 
- unix.o:   qhull.h user.h mem.h
- qconvex.o:   qhull.h user.h mem.h
-@@ -100,6 +100,8 @@
- 
- .c.o:
- 	$(CC) -c $(CCOPTS1) $<
-+	mkdir -p .libs
-+	$(CC) -c $(CCOPTS1) -fPIC $< -o .libs/$@
- 
- clean:
- 	rm -f *.o ../core qconvex qdelaunay qhalf qvoronoi qhull 
-@@ -142,23 +144,23 @@
- 
- # don't use ../qconvex.  Does not work on Red Hat Linux
- qconvex: qconvex.o libqhull.a
--	$(CC) -o qconvex $(CCOPTS2) qconvex.o -L. -lqhull -lm 
-+	$(CC) -o qconvex $(CCOPTS2) qconvex.o -L. libqhull.a -lm 
- 	cp qconvex ..
- 
- qdelaunay: qdelaun.o libqhull.a
--	$(CC) -o qdelaunay $(CCOPTS2) qdelaun.o -L. -lqhull -lm 
-+	$(CC) -o qdelaunay $(CCOPTS2) qdelaun.o -L. libqhull.a -lm 
- 	cp qdelaunay ..
- 
- qhalf: qhalf.o libqhull.a
--	$(CC) -o qhalf $(CCOPTS2) qhalf.o -L. -lqhull -lm 
-+	$(CC) -o qhalf $(CCOPTS2) qhalf.o -L. libqhull.a -lm 
- 	cp qhalf ..
- 
- qvoronoi: qvoronoi.o libqhull.a
--	$(CC) -o qvoronoi $(CCOPTS2) qvoronoi.o -L. -lqhull -lm 
-+	$(CC) -o qvoronoi $(CCOPTS2) qvoronoi.o -L. libqhull.a -lm 
- 	cp qvoronoi ..
- 
- qhull: unix.o libqhull.a
--	$(CC) -o qhull $(CCOPTS2) unix.o -L. -lqhull -lm 
-+	$(CC) -o qhull $(CCOPTS2) unix.o -L. libqhull.a -lm 
- 	cp qhull ..
- 	-chmod +x ../eg/q_test ../eg/q_eg ../eg/q_egtest
- 	-cd ..; ./rbox D4 | ./qhull
-@@ -179,11 +181,13 @@
- 	cp rbox ..
- 
- user_eg: user_eg.o libqhull.a 
--	$(CC)  -o user_eg $(CCOPTS2) user_eg.o  -L. -lqhull -lm 
-+	$(CC)  -o user_eg $(CCOPTS2) user_eg.o  -L. libqhull.a -lm 
- 	cp user_eg ..
- 
- user_eg2: user_eg2.o libqhull.a 
--	$(CC)  -o user_eg2 $(CCOPTS2) user_eg2.o  -L. -lqhull -lm 
-+	$(CC)  -o user_eg2 $(CCOPTS2) user_eg2.o  -L. libqhull.a -lm 
- 	cp user_eg2 ..
- 
- # end of Makefile
-+libqhull.so: $(OBJS)
-+	${CXX} -shared -Xlinker -soname -Xlinker $@ -o libqhull.so $(addprefix .libs/,$(OBJS))
diff --git a/media-libs/qhull/qhull-2003.1-r1.ebuild b/media-libs/qhull/qhull-2003.1-r1.ebuild
deleted file mode 100644
index 59d0bc86c0af..000000000000
--- a/media-libs/qhull/qhull-2003.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-2003.1-r1.ebuild,v 1.11 2010/07/09 09:13:57 ssuominen Exp $
-
-EAPI=2
-inherit eutils flag-o-matic
-
-MY_P="${PN}${PV}"
-DESCRIPTION="Geometry library"
-HOMEPAGE="http://www.qhull.org"
-SRC_URI="${HOMEPAGE}/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="alpha amd64 ~hppa ppc ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-pkg_setup() {
-	append-flags -fno-strict-aliasing
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm -fr "${D}"/usr/share/doc/${PN}
-	dodoc Announce.txt File_id.diz README.txt REGISTER.txt
-	if use doc; then
-		cd html
-		dohtml * || die
-		dodoc *.txt || die
-	fi
-}
diff --git a/media-libs/qhull/qhull-2010.1-r2.ebuild b/media-libs/qhull/qhull-2010.1-r2.ebuild
index cd7bb7816e6c..904773658eb7 100644
--- a/media-libs/qhull/qhull-2010.1-r2.ebuild
+++ b/media-libs/qhull/qhull-2010.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-2010.1-r2.ebuild,v 1.6 2011/06/28 19:59:33 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-2010.1-r2.ebuild,v 1.7 2012/01/14 10:36:56 xarthisius Exp $
 
 EAPI=3
 
@@ -13,7 +13,7 @@ SRC_URI="${HOMEPAGE}/download/${P}-src.tgz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc static-libs"
 
 DOCS="Announce.txt File_id.diz README.txt REGISTER.txt"