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

(Portage version: 2.2_rc67/cvs/Linux x86_64)

6 files changed, 23 insertions, 18 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/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"