Added prefix changes, thanks rei4dan #327519; keyworded for ~-linux prefix

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

7 files changed, 39 insertions, 24 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 12c6ff777afb..2594ca5a7332 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.162 2010/06/26 17:47:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.163 2010/07/24 16:08:54 jlec Exp $
+
+  24 Jul 2010; Justin Lecher <jlec@gentoo.org> fltk-1.1.9.ebuild,
+  fltk-1.1.9-r1.ebuild, fltk-1.1.9-r2.ebuild, fltk-1.1.10.ebuild,
+  fltk-1.1.10-r1.ebuild:
+  Added prefix changes, thanks rei4dan #327519; keyworded for ~-linux prefix
 
   26 Jun 2010; Raúl Porcel <armin76@gentoo.org> fltk-2.0_pre6970.ebuild:
   alpha/arm/ia64/sparc stable wrt #319541
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index c73be9b31ff0..12bea97baf82 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX FLTKConfig.cmake 1217 RMD160 5dd0903afe144b63c17dfb50b318b9d994787697 SHA1 2b09f60de6ae8ba1c1d625240e734b0413e643ca SHA256 cefffd18b6320c83aa546c953790b3dab9e4b99c0f43633b6994bdb7db69877e
 AUX fltk-1.1.7-amd64.patch 2433 RMD160 fb625474ff36b75a35394862b45653c30c6728e5 SHA1 f28f8a87f62e006a7544ff029d62e89a8d87a39c SHA256 25619bc596b59824d4e5737b0796f2e79ea6f2ca1dc4aabaa69702be1bf80e10
 AUX fltk-1.1.7-as-needed.patch 4767 RMD160 5f2b64450cd2347b9357799f5ddb32084e913b7a SHA1 90e819e5f1dd577a33e818dab4ef24f623bbf06d SHA256 c19b73f1fd75d1a38df958577c5288f6b10cad64e9fb7b54e6b0ffef57f88772
@@ -21,12 +24,19 @@ AUX libs-1.7.diff 960 RMD160 3874beff965b46c4a60e99ba5bb90c563b3501f7 SHA1 13630
 DIST fltk-1.1.10-source.tar.bz2 2214382 RMD160 f8fc4371811efcc0d6fc73edd0525d8ff87a4faa SHA1 0d2b34fede91fa78eeaefb893dd70282f73908a8 SHA256 37ada22bf2586b8dd30d84209b8b58bdcb864627e5d02ae3f2c323a29261b19a
 DIST fltk-1.1.9-source.tar.bz2 2206178 RMD160 f22e83fc9fd5e8bc10f0eea55e1a4df2ba132d91 SHA1 6f21903dc53c829ec71e8e49655eb19e624c8247 SHA256 facba5a97a20ca92b32504174474775c6b12fb67a6f646fa0de18db709c3edde
 DIST fltk-2.0.x-r6970.tar.bz2 2529193 RMD160 5d114b5861807a15638d2b0f7ac55a909c1b6870 SHA1 0aaa688786a858b7af84e992d5438aab4ba84b0e SHA256 0d88c16967ca40b26a70736b0d6874046c31a9e74816806816252e4eb72a84a3
-EBUILD fltk-1.1.10-r1.ebuild 3805 RMD160 f02b906ccecba27b607bf661844d3359cc9b9f2f SHA1 b6a7247099f77515435f4fed9b79ab54bdc04f26 SHA256 ab3f04b5dcb055e262681d999eb29fe025d5b7f2c570b384b1508524c9243c82
-EBUILD fltk-1.1.10.ebuild 3752 RMD160 2bac639bb97d54bb5f6ff1255d582e3db8962266 SHA1 d50fae926dc4dde956b2ae2faf9214e8bd8243b1 SHA256 04e56cea60b627f658c751394402dc51ea547e219e96d29ea236984272dbd729
-EBUILD fltk-1.1.9-r1.ebuild 3661 RMD160 5d817c205ed158244c0394e73ddc29ea5d0c0e7c SHA1 f4a702e72c2f5f45a20f589e3c989c9cbe731e76 SHA256 bf62bf34236b7bf416110402c6023714bd07abf7aae21ff0c3bdd41ec4af7f64
-EBUILD fltk-1.1.9-r2.ebuild 3715 RMD160 09ea840feacc97b38d5f70aa6119025ada1b0c23 SHA1 f9c1d5ee143fd7e474026ef658cdd8dab80edba5 SHA256 dd4951e8fefbc9fe39a727f729d99b36a94aeaa2c57d56d04723d0d2f2d537aa
-EBUILD fltk-1.1.9.ebuild 3520 RMD160 346b6a158a2ce1acbc948edeb115d19681fd94d4 SHA1 b29180ba8d30ae85c522add42421e820043e1b6a SHA256 eacb337d6aeba4a61ef3eb7fe059f76f1541c599fe1b347892b0dafc2d9c37e5
+EBUILD fltk-1.1.10-r1.ebuild 3877 RMD160 76cd72c91e9e3ecaaa3e59161b5af553d335c937 SHA1 3ee01380d3adfa220f03fb6b2018020cb3fab9f1 SHA256 6cafc3580563c5117cf9e1cbf6805a35ea939b2930c1ae2f6b9656ca944f7785
+EBUILD fltk-1.1.10.ebuild 3752 RMD160 c7691ee26e85664784554826127b825b51fd490b SHA1 1055692cb0738666156e7d64b0c5053e6ff771e0 SHA256 dec7a679f11aed762e69d7d9d6591c08b36e705096b92f3d78723c06d97cef67
+EBUILD fltk-1.1.9-r1.ebuild 3658 RMD160 a14f53cc7cddc7d62634177ab0f3ec3407a00b06 SHA1 a6baf7f1d30ad1752b2f9bacfadac6ce7ef70915 SHA256 33946224bd90bcb5deb4e8e646ab776d0831770f17961d4564751635b50ebc0d
+EBUILD fltk-1.1.9-r2.ebuild 3710 RMD160 d1dd5a026d69784653aa27db32035dd2cff9dd99 SHA1 5c9e8910da0c40f5de33052120167749b562b3cb SHA256 94018696f9e42f1f7ea96215247e8246abe375261062de371f7e17e8e53d484d
+EBUILD fltk-1.1.9.ebuild 3514 RMD160 46d1d0aa21c4842c1e6ed7390254ac036ce8ced0 SHA1 2a05440d282118d10e4ef3cf17a8bee2cad8b79c SHA256 487c5f3362dc32d494d9825656886de1c80edaf1bc50d743ab2974f55d463c56
 EBUILD fltk-2.0_pre6970-r1.ebuild 2607 RMD160 95a6f14b256a913472c4e6ae8b725b1785a14a51 SHA1 6fbd290f2ecdc0b7c43755b91beeb3d9dbcbd114 SHA256 2a730f0e3f2ddfe92fdb2721c07c32cee4649cf04f2fe7dfaedb13ed7420faf7
 EBUILD fltk-2.0_pre6970.ebuild 2501 RMD160 9503b70f0b2c99c5be339fd8de91bf0c49a1e6e4 SHA1 8760931fd4e9b54acd6b7f960010b62adb9f6985 SHA256 45be5e1f3828ca60357eed88ea2a050e1b7fb1af3fdeb12dc32ca3b5b110e39a
-MISC ChangeLog 22227 RMD160 9d1e2ab0564b568ce16658bde5cc6fb55dfad64b SHA1 8c3213da3e48d200e3ef141535f9f34a898af1ff SHA256 2079b3b470bfd8908260d24e3fc5b5016a74cf2ba497044a6186e82331c98551
+MISC ChangeLog 22459 RMD160 d3eb9343ec99794e41f3bdc16d23d1cfcbdcd49c SHA1 df8e3ceb16821a016feb50646c0b1db729ab70ee SHA256 c72140d87e0618b997fd07f4b32c8ebc9bf72d1a08ac416944c4416156e0b342
 MISC metadata.xml 657 RMD160 24969ef07785738fc34d10c79dcc854d2a895ec3 SHA1 8afd06ddc3b01090acf0333f2ac41fc4a692f504 SHA256 f37b711686e55a32ab4a1e050ee6e98fbfd7e6d7839c53926b6103fff61c44b1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkxLEB0ACgkQgAnW8HDreRbnbQCghpREjvrCkdFeEjhDSCRX76pw
+RNwAnjvKiSqMsEYBrULgzldJot7UtJ/R
+=QuoA
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/fltk/fltk-1.1.10-r1.ebuild b/x11-libs/fltk/fltk-1.1.10-r1.ebuild
index eca324c7810d..62f1c645ddf1 100644
--- a/x11-libs/fltk/fltk-1.1.10-r1.ebuild
+++ b/x11-libs/fltk/fltk-1.1.10-r1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.10-r1.ebuild,v 1.1 2010/05/30 17:03:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.10-r1.ebuild,v 1.2 2010/07/24 16:08:54 jlec Exp $
 
-EAPI=2
+EAPI=3
 inherit eutils autotools versionator fdo-mime
 
-DESCRIPTION="C++ user interface toolkit for X and OpenGL."
+DESCRIPTION="C++ user interface toolkit for X and OpenGL"
 HOMEPAGE="http://www.fltk.org"
 SRC_URI="mirror://easysw/${PN}/${PV}/${P}-source.tar.bz2"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 LICENSE="FLTK LGPL-2"
 
 SLOT="$(get_version_component_range 1-2)"
@@ -26,14 +26,14 @@ RDEPEND="x11-libs/libXext
 	opengl? ( virtual/opengl virtual/glu )
 	xinerama? ( x11-libs/libXinerama )
 	xft? ( x11-libs/libXft )
-	>=sys-libs/glibc-2.10"   # glibc-2.10 patch breaks with 2.9, bug 276695
+	!prefix? ( >=sys-libs/glibc-2.10 )"   # glibc-2.10 patch breaks with 2.9, bug 276695
 DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	doc? ( app-text/htmldoc )
 	xinerama? ( x11-proto/xineramaproto )"
 
-INCDIR=/usr/include/fltk-${SLOT}
-LIBDIR=/usr/$(get_libdir)/fltk-${SLOT}
+INCDIR=${EPREFIX}/usr/include/fltk-${SLOT}
+LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk-${SLOT}
 
 src_prepare() {
 	epatch "${FILESDIR}"/fltk-1.1.9-share.patch
@@ -67,7 +67,7 @@ src_configure() {
 	econf \
 		--includedir=${INCDIR}\
 		--libdir=${LIBDIR} \
-		--docdir=/usr/share/doc/${PF}/html \
+		--docdir=${EPREFIX}/usr/share/doc/${PF}/html \
 		--enable-largefile \
 		--enable-shared \
 		--enable-xdbe \
@@ -124,7 +124,7 @@ src_install() {
 	doins CMake/FLTK*.cmake
 
 	echo "LDPATH=${LIBDIR}" > 99fltk-${SLOT}
-	echo "FLTK_DOCDIR=/usr/share/doc/${PF}/html" >> 99fltk-${SLOT}
+	echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk-${SLOT}
 	doenvd 99fltk-${SLOT}
 }
 
diff --git a/x11-libs/fltk/fltk-1.1.10.ebuild b/x11-libs/fltk/fltk-1.1.10.ebuild
index d991e45cb6ef..81000a859c6a 100644
--- a/x11-libs/fltk/fltk-1.1.10.ebuild
+++ b/x11-libs/fltk/fltk-1.1.10.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.10.ebuild,v 1.1 2010/02/08 20:12:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.10.ebuild,v 1.2 2010/07/24 16:08:54 jlec Exp $
 
 EAPI=2
 inherit eutils autotools versionator fdo-mime
 
-DESCRIPTION="C++ user interface toolkit for X and OpenGL."
+DESCRIPTION="C++ user interface toolkit for X and OpenGL"
 HOMEPAGE="http://www.fltk.org"
 SRC_URI="mirror://easysw/${PN}/${PV}/${P}-source.tar.bz2"
 
diff --git a/x11-libs/fltk/fltk-1.1.9-r1.ebuild b/x11-libs/fltk/fltk-1.1.9-r1.ebuild
index 6353bd54e993..5b8b0b6cd028 100644
--- a/x11-libs/fltk/fltk-1.1.9-r1.ebuild
+++ b/x11-libs/fltk/fltk-1.1.9-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.9-r1.ebuild,v 1.12 2010/06/01 13:27:21 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.9-r1.ebuild,v 1.13 2010/07/24 16:08:54 jlec Exp $
 
 EAPI=2
 inherit eutils autotools versionator fdo-mime
 
-DESCRIPTION="C++ user interface toolkit for X and OpenGL."
+DESCRIPTION="C++ user interface toolkit for X and OpenGL"
 HOMEPAGE="http://www.fltk.org"
 SRC_URI="mirror://easysw/${PN}/${PV}/${P}-source.tar.bz2"
 
diff --git a/x11-libs/fltk/fltk-1.1.9-r2.ebuild b/x11-libs/fltk/fltk-1.1.9-r2.ebuild
index 464488f4425d..b7bb3e0eb7ba 100644
--- a/x11-libs/fltk/fltk-1.1.9-r2.ebuild
+++ b/x11-libs/fltk/fltk-1.1.9-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.9-r2.ebuild,v 1.1 2010/05/30 10:44:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.9-r2.ebuild,v 1.2 2010/07/24 16:08:54 jlec Exp $
 
 EAPI=2
 inherit eutils autotools versionator fdo-mime
 
-DESCRIPTION="C++ user interface toolkit for X and OpenGL."
+DESCRIPTION="C++ user interface toolkit for X and OpenGL"
 HOMEPAGE="http://www.fltk.org"
 SRC_URI="mirror://easysw/${PN}/${PV}/${P}-source.tar.bz2"
 
diff --git a/x11-libs/fltk/fltk-1.1.9.ebuild b/x11-libs/fltk/fltk-1.1.9.ebuild
index 68b5228d39b9..a0a26b0a5c78 100644
--- a/x11-libs/fltk/fltk-1.1.9.ebuild
+++ b/x11-libs/fltk/fltk-1.1.9.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.9.ebuild,v 1.11 2010/05/13 14:58:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.9.ebuild,v 1.12 2010/07/24 16:08:54 jlec Exp $
 
 EAPI=2
 inherit eutils autotools versionator fdo-mime
 
-DESCRIPTION="C++ user interface toolkit for X and OpenGL."
+DESCRIPTION="C++ user interface toolkit for X and OpenGL"
 HOMEPAGE="http://www.fltk.org"
 SRC_URI="mirror://easysw/${PN}/${PV}/${P}-source.tar.bz2"