Remove old version wrt #303087.

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

4 files changed, 6 insertions, 208 deletions

diff --git a/x11-libs/fxscintilla/ChangeLog b/x11-libs/fxscintilla/ChangeLog
index b2c7d6aa3979..fd9651d5ae73 100644
--- a/x11-libs/fxscintilla/ChangeLog
+++ b/x11-libs/fxscintilla/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/fxscintilla
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/ChangeLog,v 1.48 2010/06/25 16:57:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/ChangeLog,v 1.49 2010/06/25 17:04:23 ssuominen Exp $
+
+  25 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  -files/1.62-fox-SLOT.patch, -fxscintilla-1.71-r1.ebuild,
+  -files/1.62-shared-libs.patch:
+  Remove old version wrt #303087.
 
   25 Jun 2010; Jeroen Roovers <jer@gentoo.org> fxscintilla-1.71-r2.ebuild:
   Stable for HPPA (bug #309175).
diff --git a/x11-libs/fxscintilla/files/1.62-fox-SLOT.patch b/x11-libs/fxscintilla/files/1.62-fox-SLOT.patch
deleted file mode 100644
index 9b1efe2d9f84..000000000000
--- a/x11-libs/fxscintilla/files/1.62-fox-SLOT.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- fxscintilla-1.62-orig/src/Makefile.am	2003-08-08 15:04:16.000000000 -0400
-+++ fxscintilla-1.62/src/Makefile.am	2005-04-07 01:33:32.000000000 -0400
-@@ -17,20 +17,20 @@
- AM_LDFLAGS = -mwindows
- endif # MinGW32
- 
--lib_LTLIBRARIES = libfxscintilla.la
-+lib_LTLIBRARIES =
-+
-+if HAVE_FOX_1_0
-+lib_LTLIBRARIES += libfxscintilla.la
- 
- libfxscintilla_la_SOURCES = \
- 	PlatFOX.cxx \
- 	ScintillaFOX.cxx
- 
--libfxscintilla_la_LIBADD = \
--	$(top_builddir)/scintilla/src/libscintilla.la
--
- ## No need for ltdl with Fox 1.1
--if HAVE_FOX_1_0
--libfxscintilla_la_LIBADD += \
--	$(top_builddir)/ltdl/libltdl.la
--endif # HAVE_FOX_1_0
-+libfxscintilla_la_LIBADD = \
-+	$(top_builddir)/scintilla/src/libscintilla.la \
-+	$(top_builddir)/ltdl/libltdl.la \
-+	-L$(FOX_LIB_DIR) -lFOX
- 
- libfxscintilla_la_LDFLAGS = \
- 	-version-info $(LT_FXSCINTILLA_CURRENT):$(LT_FXSCINTILLA_REVISION):$(LT_FXSCINTILLA_AGE)
-@@ -46,10 +46,48 @@
- 	PlatFOX.cxx \
- 	ScintillaFOX.cxx
- 
--libfxscintillanolexer_la_LIBADD = $(top_builddir)/scintilla/src/libscintillanolexer.la
-+libfxscintillanolexer_la_LIBADD = \
-+	$(top_builddir)/scintilla/src/libscintillanolexer.la \
-+	-L$(FOX_LIB_DIR) -lFOX
- 
- libfxscintillanolexer_la_LDFLAGS = \
- 	-version-info $(LT_FXSCINTILLANOLEXER_CURRENT):$(LT_FXSCINTILLANOLEXER_REVISION):$(LT_FXSCINTILLANOLEXER_AGE)
- 
- endif # NOLEXER
-+endif # HAVE_FOX_1_0
-+
-+
-+if HAVE_FOX_1_2
-+lib_LTLIBRARIES += libfxscintilla-1.2.la
-+
-+libfxscintilla_1_2_la_SOURCES = \
-+	PlatFOX.cxx \
-+	ScintillaFOX.cxx
-+
-+libfxscintilla_1_2_la_LIBADD = \
-+	$(top_builddir)/scintilla/src/libscintilla.la \
-+	-L$(FOX_LIB_DIR) -lFOX-1.2
- 
-+libfxscintilla_1_2_la_LDFLAGS = \
-+	-version-info $(LT_FXSCINTILLA_CURRENT):$(LT_FXSCINTILLA_REVISION):$(LT_FXSCINTILLA_AGE)
-+
-+libfxscintilla_1_2_la_CXXFLAGS = $(AM_CXXFLAGS) -DSCI_LEXER
-+
-+## NoLexer enabled
-+if NOLEXER
-+
-+lib_LTLIBRARIES += libfxscintillanolexer-1.2.la
-+
-+libfxscintillanolexer_1_2_la_SOURCES = \
-+	PlatFOX.cxx \
-+	ScintillaFOX.cxx
-+
-+libfxscintillanolexer_1_2_la_LIBADD = \
-+	$(top_builddir)/scintilla/src/libscintillanolexer.la \
-+	-L$(FOX_LIB_DIR) -lFOX-1.2
-+
-+libfxscintillanolexer_1_2_la_LDFLAGS = \
-+	-version-info $(LT_FXSCINTILLANOLEXER_CURRENT):$(LT_FXSCINTILLANOLEXER_REVISION):$(LT_FXSCINTILLANOLEXER_AGE)
-+
-+endif # NOLEXER
-+endif # HAVE_FOX_1_2
---- fxscintilla-1.62-orig/tests/Makefile.am	2004-05-24 16:29:27.000000000 -0400
-+++ fxscintilla-1.62/tests/Makefile.am	2005-04-06 23:37:35.000000000 -0400
-@@ -1,12 +1,11 @@
- INCLUDES = -I$(top_srcdir)/include -I$(FOX_INCLUDE_DIR)
--LDADD = -L$(FOX_LIB_DIR) $(top_builddir)/src/libfxscintilla.la
- 
- if HAVE_FOX_1_0
--LDADD += -lFOX
-+LDADD = -L$(FOX_LIB_DIR) $(top_builddir)/src/libfxscintilla.la -lFOX
- endif
- 
- if HAVE_FOX_1_2
--LDADD += -lFOX-1.2
-+LDADD = -L$(FOX_LIB_DIR) $(top_builddir)/src/libfxscintilla-1.2.la -lFOX-1.2
- endif
- 
- AM_CXXFLAGS = $(PTHREAD_CFLAGS) -W -Wall -DFOX -DSCI_LEXER
diff --git a/x11-libs/fxscintilla/files/1.62-shared-libs.patch b/x11-libs/fxscintilla/files/1.62-shared-libs.patch
deleted file mode 100644
index a52c2a00ec39..000000000000
--- a/x11-libs/fxscintilla/files/1.62-shared-libs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- fxscintilla-1.62-orig/configure.in	2005-01-16 11:26:34.000000000 -0500
-+++ fxscintilla-1.62/configure.in	2005-01-16 11:27:40.000000000 -0500
-@@ -13,9 +13,6 @@
- AM_CONDITIONAL(HAVE_MINGW32, test x"$HAVE_MINGW32" = xyes)
- 
- dnl Using libtool
--if test x"$HAVE_CYGWIN" = xyes -o x"$HAVE_MINGW32" = xyes; then
--  AC_DISABLE_SHARED
--fi
- AM_PROG_LIBTOOL
- 
- dnl Must have a C++ compiler
---- fxscintilla-1.62-orig/Makefile.am	2005-01-16 11:41:12.000000000 -0500
-+++ fxscintilla-1.62/Makefile.am	2005-01-16 11:40:50.000000000 -0500
-@@ -1 +1,4 @@
- SUBDIRS = scintilla include ltdl src tests .
-+
-+ACLOCAL_AMFLAGS = -I config
-+
diff --git a/x11-libs/fxscintilla/fxscintilla-1.71-r1.ebuild b/x11-libs/fxscintilla/fxscintilla-1.71-r1.ebuild
deleted file mode 100644
index 77a8a9ef3919..000000000000
--- a/x11-libs/fxscintilla/fxscintilla-1.71-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/fxscintilla-1.71-r1.ebuild,v 1.10 2009/05/05 07:40:41 ssuominen Exp $
-
-inherit autotools eutils multilib
-
-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="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="doc"
-
-RDEPEND="=x11-libs/fox-1.4*
-	=x11-libs/fox-1.6*"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/1.71-shared-libs.patch \
-		"${FILESDIR}"/1.71-fox-SLOT.patch
-
-	touch NEWS AUTHORS
-	eautoreconf || die "autoreconf error"
-}
-
-src_compile () {
-	# Borrowed from wxGTK ebuild
-
-	einfo "Building ${PN} for FOX-1.4..."
-	mkdir "${S}"/build_1_4
-	cd "${S}"/build_1_4
-	../configure \
-		--prefix=/usr \
-		--includedir=/usr/include \
-		--libdir=/usr/$(get_libdir) \
-		${EXTRA_ECONF} \
-		--enable-nolexer \
-		--with-fox-1-4 \
-		--with-foxinclude=/usr/include \
-		--with-foxlib=/usr/lib \
-		|| die "configure error"
-	emake || die "make error"
-
-	einfo "Building ${PN} for FOX-1.6..."
-	mkdir "${S}"/build_1_6
-	cd "${S}"/build_1_6
-	../configure \
-		--prefix=/usr \
-		--includedir=/usr/include \
-		--libdir=/usr/$(get_libdir) \
-		${EXTRA_ECONF} \
-		--enable-nolexer \
-		--with-fox-1-6 \
-		--with-foxinclude=/usr/include \
-		|| die "configure error"
-	emake || die "make error"
-}
-
-src_install () {
-	cd "${S}"/build_1_4
-	emake DESTDIR="${D}" install || die "make install error"
-
-	cd "${S}"/build_1_6
-	emake 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() {
-	elog "New as of 1.71-r1:"
-	elog "FXScintilla is now built separately against FOX-1.4 and -1.6."
-	elog "Support for FOX-1.0 has been dropped upstream."
-	elog "Support for FOX-1.2 has been dropped by gentoo."
-	elog "The Librarys are named for the FOX-release they correspond to, for"
-	elog "example: For FOX-1.4, the library is called libfxscintilla-1.4."
-	elog "Anything linked against previous releases of FOX and fxscintilla"
-	elog "may need to be rebuilt."
-	elog
-	elog "The nolexer libraries are now included in this release as well."
-}