${ROOT} fix (bug #168044) and cleanup

(Portage version: 2.1.2-r10)

5 files changed, 13 insertions, 101 deletions

diff --git a/x11-libs/fxscintilla/ChangeLog b/x11-libs/fxscintilla/ChangeLog
index 73bb8a6cadd9..33336de505f5 100644
--- a/x11-libs/fxscintilla/ChangeLog
+++ b/x11-libs/fxscintilla/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/fxscintilla
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/ChangeLog,v 1.23 2007/02/05 09:00:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/ChangeLog,v 1.24 2007/02/23 16:24:46 mabi Exp $
+
+  23 Feb 2007; Matti Bickel <mabi@gentoo.org> -fxscintilla-1.62-r1.ebuild,
+  fxscintilla-1.62-r2.ebuild, fxscintilla-1.71.ebuild:
+  ${ROOT} fix (bug #168044) and cleanup
 
   05 Feb 2007; Jeroen Roovers <jer@gentoo.org> fxscintilla-1.71.ebuild:
   Stable for HPPA.
diff --git a/x11-libs/fxscintilla/files/digest-fxscintilla-1.62-r1 b/x11-libs/fxscintilla/files/digest-fxscintilla-1.62-r1
deleted file mode 100644
index c584418c90d8..000000000000
--- a/x11-libs/fxscintilla/files/digest-fxscintilla-1.62-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c4cb1b9d954b92e1e1fdcb75597662c6 fxscintilla-1.62.tar.gz 833249
-RMD160 fa191090b252d5f631a7a9d0d935749bb3a9c246 fxscintilla-1.62.tar.gz 833249
-SHA256 5db9a3b17bee7f8e4b4f877d57e253bee7122e5b081adb41791faabba25c194c fxscintilla-1.62.tar.gz 833249
diff --git a/x11-libs/fxscintilla/fxscintilla-1.62-r1.ebuild b/x11-libs/fxscintilla/fxscintilla-1.62-r1.ebuild
deleted file mode 100644
index 7e9fa2b7273b..000000000000
--- a/x11-libs/fxscintilla/fxscintilla-1.62-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/fxscintilla-1.62-r1.ebuild,v 1.1 2005/05/07 19:40:49 rphillips Exp $
-
-inherit eutils
-
-DESCRIPTION="A free source code editing component for the FOX-Toolkit"
-HOMEPAGE="http://www.nongnu.org/fxscintilla/"
-SRC_URI="http://savannah.nongnu.org/download/fxscintilla/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha"
-IUSE="doc"
-
-DEPEND="=x11-libs/fox-1.0*
-	=x11-libs/fox-1.2*"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/1.62-shared-libs.patch || die
-	epatch ${FILESDIR}/1.62-fox-SLOT.patch || die
-
-	einfo "Running autoreconf..."
-	touch NEWS AUTHORS
-	autoreconf --install --force || die "autoreconf error"
-}
-
-src_compile () {
-	# Borrowed from wxGTK ebuild
-
-	einfo "Building ${PN} for FOX-1.0..."
-	mkdir ${S}/build_1_0
-	cd ${S}/build_1_0
-	../configure \
-		--prefix=/usr \
-		--includedir=/usr/include \
-		--libdir=/usr/lib \
-		${EXTRA_ECONF} \
-		--enable-nolexer \
-		--with-fox-1-0 \
-		--with-foxinclude=${ROOT}usr/include \
-		--with-foxlib=${ROOT}usr/lib \
-		|| die "configure error"
-	emake || die "make error"
-
-	einfo "Building ${PN} for FOX-1.2..."
-	mkdir ${S}/build_1_2
-	cd ${S}/build_1_2
-	../configure \
-		--prefix=/usr \
-		--includedir=/usr/include \
-		--libdir=/usr/lib \
-		${EXTRA_ECONF} \
-		--enable-nolexer \
-		--with-foxinclude=${ROOT}usr/include \
-		--with-foxlib=${ROOT}usr/lib \
-		|| die "configure error"
-	emake || die "make error"
-}
-
-src_install () {
-	cd ${S}/build_1_0
-	make DESTDIR="${D}" install || die "make install error"
-
-	cd ${S}/build_1_2
-	make DESTDIR="${D}" install || die "make install error"
-
-	cd ${S}
-	dodoc README
-	if use doc ; then
-		dodoc scintilla/doc/Lexer.txt
-		dohtml scintilla/doc/*
-	fi
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "New as of 1.62-r1:"
-	ewarn "FXScintilla is now built separately against FOX-1.0 and FOX-1.2."
-	ewarn "For FOX-1.2, the library is called libfxscintilla-1.2."
-	ewarn "Anything linked against previous releases of FOX-1.2 and fxscintilla"
-	ewarn "may need to be rebuilt."
-	ewarn
-	einfo "The nolexer libraries are now included in this release as well."
-	epause 5
-}
diff --git a/x11-libs/fxscintilla/fxscintilla-1.62-r2.ebuild b/x11-libs/fxscintilla/fxscintilla-1.62-r2.ebuild
index 6344eb1f1b38..1c897212888e 100644
--- a/x11-libs/fxscintilla/fxscintilla-1.62-r2.ebuild
+++ b/x11-libs/fxscintilla/fxscintilla-1.62-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/fxscintilla-1.62-r2.ebuild,v 1.1 2006/12/18 22:46:52 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/fxscintilla-1.62-r2.ebuild,v 1.2 2007/02/23 16:24:46 mabi Exp $
 
 inherit eutils
 
@@ -39,8 +39,8 @@ src_compile () {
 		--libdir=/usr/lib \
 		${EXTRA_ECONF} \
 		--enable-nolexer \
-		--with-foxinclude=${ROOT}usr/include \
-		--with-foxlib=${ROOT}usr/lib \
+		--with-foxinclude=/usr/include \
+		--with-foxlib=/usr/lib \
 		|| die "configure error"
 	emake || die "make error"
 }
diff --git a/x11-libs/fxscintilla/fxscintilla-1.71.ebuild b/x11-libs/fxscintilla/fxscintilla-1.71.ebuild
index b844ff76eeaf..f1b8a8341421 100644
--- a/x11-libs/fxscintilla/fxscintilla-1.71.ebuild
+++ b/x11-libs/fxscintilla/fxscintilla-1.71.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/fxscintilla-1.71.ebuild,v 1.7 2007/02/05 09:00:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/fxscintilla-1.71.ebuild,v 1.8 2007/02/23 16:24:46 mabi Exp $
 
 inherit eutils
 
@@ -57,8 +57,8 @@ src_compile () {
 		${EXTRA_ECONF} \
 		--enable-nolexer \
 		--with-fox-1-4 \
-		--with-foxinclude=${ROOT}usr/include \
-		--with-foxlib=${ROOT}usr/lib \
+		--with-foxinclude=/usr/include \
+		--with-foxlib=/usr/lib \
 		|| die "configure error"
 	emake || die "make error"
 
@@ -72,7 +72,7 @@ src_compile () {
 		${EXTRA_ECONF} \
 		--enable-nolexer \
 		--with-fox-1-6 \
-		--with-foxinclude=${ROOT}usr/include \
+		--with-foxinclude=/usr/include \
 		|| die "configure error"
 	emake || die "make error"
 }