Spring Clean

svn path=/; revision=112

5 files changed, 0 insertions, 320 deletions

diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
deleted file mode 100644
index 997ee48..0000000
--- a/x11-libs/fltk/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX fltk-1.1.7-as-needed.patch 4767 RMD160 5f2b64450cd2347b9357799f5ddb32084e913b7a SHA1 90e819e5f1dd577a33e818dab4ef24f623bbf06d SHA256 c19b73f1fd75d1a38df958577c5288f6b10cad64e9fb7b54e6b0ffef57f88772
-AUX fltk-1.1.7-fltk-config.patch 1510 RMD160 8c646facc81dd31d8d4d959b0df72db63154c380 SHA1 9f60969f3c08a15cfc86c4394bd71200bbb8be42 SHA256 d5e39cf43ff62235696c309fb2c2733cd1d94ac7d82882562264b13ca144cf6f
-AUX libs-1.7.diff 960 RMD160 3874beff965b46c4a60e99ba5bb90c563b3501f7 SHA1 136301dbfa9b9a3dc5cad303b53b79c019c942c8 SHA256 bd95ae19749cdeb04701ff91cc97e5c6c4b7bad5c9d07a80af02d98f01d88330
-DIST fltk-1.1.7-source.tar.bz2 2060757 RMD160 a539a1c6bb3363e54bc82c7995037c5d8ede9dd7 SHA1 16b174522920403af1e4ccddd36daaefda3765c8 SHA256 855a97e35da823f205253b865758715872cd2c7720e4dcf134a3b6dc18bfb96a
-EBUILD fltk-1.1.7-r1.ebuild 2511 RMD160 f2c1d64e79dd27b7951ca29de2c20616f4da66c0 SHA1 de45df3441cdb9bdc972094c2c0603c6c023293f SHA256 7f6413140afebc9e8deb01e7c7bcaaa15748a1b1324ca8da394e82709ad3cd88
diff --git a/x11-libs/fltk/files/fltk-1.1.7-as-needed.patch b/x11-libs/fltk/files/fltk-1.1.7-as-needed.patch
deleted file mode 100644
index 9e5305a..0000000
--- a/x11-libs/fltk/files/fltk-1.1.7-as-needed.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- fltk-1.1.7/configure.in.old	2006-11-12 14:30:49.000000000 +0100
-+++ fltk-1.1.7/configure.in	2006-11-12 14:31:58.000000000 +0100
-@@ -171,7 +171,7 @@
-             FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
-             GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
-             IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
--            DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
-+            DSOCOMMAND="\$(CXX) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
- 	    if test "x$libdir" != "x/usr/lib"; then
- 		    DSOLINK="-Wl,-rpath,$libdir"
-             fi
-@@ -647,10 +647,9 @@
- 	    AC_MSG_WARN(Ignoring libraries \"$X_PRE_LIBS\" requested by configure.)
- 	fi
- 
--	LIBS="$LIBS -lXext -lX11 $X_EXTRA_LIBS"
-+	LIBS="$LIBS -lXext -lX11 $X_EXTRA_LIBS $X_LIBS"
- 	CFLAGS="$CFLAGS $X_CFLAGS"
- 	CXXFLAGS="$CXXFLAGS $X_CFLAGS"
--	LDFLAGS="$X_LIBS $LDFLAGS"
- 
- 	if test "x$x_includes" != x; then
- 	    ac_cpp="$ac_cpp -I$x_includes"
---- fltk-1.1.7/makeinclude.in.old	2006-11-12 14:31:05.000000000 +0100
-+++ fltk-1.1.7/makeinclude.in	2006-11-12 14:31:20.000000000 +0100
-@@ -74,8 +74,9 @@
- 
- # libraries to link with:
- AUDIOLIBS	= @AUDIOLIBS@
--LDLIBS		= @LDFLAGS@ @LIBS@
--GLDLIBS		= @LDFLAGS@ @GLLIB@ @LIBS@
-+LDFLAGS		= @LDFLAGS@
-+LDLIBS		= @LIBS@
-+GLDLIBS		= @GLLIB@ @LIBS@
- LINKFLTK	= @LINKFLTK@
- LINKFLTKGL	= @LINKFLTKGL@
- LINKFLTKFORMS	= @LINKFLTKFORMS@ @LINKFLTK@
---- fltk-1.1.7/src/Makefile.old	2006-11-12 15:30:11.000000000 +0100
-+++ fltk-1.1.7/src/Makefile	2006-11-12 15:33:56.000000000 +0100
-@@ -202,13 +202,13 @@
- 
- libfltk.so.1.1: $(OBJECTS)
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(OBJECTS)
-+	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
- 	$(RM) libfltk.so
- 	$(LN) libfltk.so.1.1 libfltk.so
- 
- libfltk.sl.1.1: $(OBJECTS)
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(OBJECTS)
-+	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
- 	$(RM) libfltk.sl
- 	$(LN) libfltk.sl.1.1 libfltk.sl
- 
-@@ -224,7 +224,7 @@
- 
- libfltk_s.a: $(OBJECTS)
- 	echo $(DSOCOMMAND) libfltk_s.o ...
--	$(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS)
-+	$(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) $(LDLIBS)
- 	echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o
- 	$(RM) $@
- 	$(LIBCOMMAND) libfltk_s.a libfltk_s.o
-@@ -238,13 +238,13 @@
- 
- libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
-+	$(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
- 	$(RM) libfltk_forms.so
- 	$(LN) libfltk_forms.so.1.1 libfltk_forms.so
- 
- libfltk_forms.sl.1.1: $(FLOBJECTS) libfltk.sl.1.1
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
-+	$(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
- 	$(RM) libfltk_forms.sl
- 	$(LN) libfltk_forms.sl.1.1 libfltk_forms.sl
- 
-@@ -260,7 +260,7 @@
- 
- libfltk_forms_s.a: $(FLOBJECTS)
- 	echo $(DSOCOMMAND) libfltk_forms_s.o ...
--	$(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS)
-+	$(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) $(LDLIBS)
- 	echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
- 	$(RM) $@
- 	$(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
-@@ -274,13 +274,13 @@
- 
- libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
-+	$(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk
- 	$(RM) libfltk_gl.so
- 	$(LN) libfltk_gl.so.1.1 libfltk_gl.so
- 
- libfltk_gl.sl.1.1: $(GLOBJECTS) libfltk.sl.1.1
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
-+	$(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk
- 	$(RM) libfltk_gl.sl
- 	$(LN) libfltk_gl.sl.1.1 libfltk_gl.sl
- 
-@@ -296,7 +296,7 @@
- 
- libfltk_gl_s.a: $(GLOBJECTS)
- 	echo $(DSOCOMMAND) libfltk_gl_s.o ...
--	$(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS)
-+	$(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(LDLIBS)
- 	echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
- 	$(RM) $@
- 	$(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
-@@ -310,13 +310,13 @@
- 
- libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
-+	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
- 	$(RM) libfltk_images.so
- 	$(LN) libfltk_images.so.1.1 libfltk_images.so
- 
- libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
-+	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
- 	$(RM) libfltk_images.sl
- 	$(LN) libfltk_images.sl.1.1 libfltk_images.sl
- 
-@@ -332,7 +332,7 @@
- 
- libfltk_images_s.a: $(IMGOBJECTS)
- 	echo $(DSOCOMMAND) libfltk_images_s.o ...
--	$(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS)
-+	$(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) $(LDLIBS)
- 	echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
- 	$(RM) $@
- 	$(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
diff --git a/x11-libs/fltk/files/fltk-1.1.7-fltk-config.patch b/x11-libs/fltk/files/fltk-1.1.7-fltk-config.patch
deleted file mode 100644
index b9fd17f..0000000
--- a/x11-libs/fltk/files/fltk-1.1.7-fltk-config.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- fltk-1.1.7.orig/fltk-config.in	2006-11-14 11:34:07.000000000 +0100
-+++ fltk-1.1.7/fltk-config.in	2006-11-14 12:29:22.000000000 +0100
-@@ -53,9 +53,6 @@
- POSTBUILD="@POSTBUILD@"
- 
- # flags for C++ compiler:
--CFLAGS="@CFLAGS@"
--CXXFLAGS="@CXXFLAGS@"
--LDFLAGS="@LDFLAGS@"
- LDLIBS="@LIBS@"
- 
- # Check for local invocation, and update paths accordingly...
-@@ -65,24 +62,24 @@
- 	libdir="$selfdir/lib"
- 
- 	if test -f "$libdir/libfltk_jpeg.a"; then
--		CFLAGS="-I$includedir/jpeg $CFLAGS"
--		CXXFLAGS="-I$includedir/jpeg $CXXFLAGS"
-+		CFLAGS="-I$includedir/jpeg"
-+		CXXFLAGS="-I$includedir/jpeg"
- 	fi
- 
- 	if test -f "$libdir/libfltk_z.a"; then
--		CFLAGS="-I$includedir/zlib $CFLAGS"
--		CXXFLAGS="-I$includedir/zlib $CXXFLAGS"
-+		CFLAGS="-I$includedir/zlib"
-+		CXXFLAGS="-I$includedir/zlib"
- 	fi
- 
- 	if test -f "$libdir/libfltk_png.a"; then
--		CFLAGS="-I$includedir/png $CFLAGS"
--		CXXFLAGS="-I$includedir/png $CXXFLAGS"
-+		CFLAGS="-I$includedir/png"
-+		CXXFLAGS="-I$includedir/png"
- 	fi
- fi
- 
- if test -d $includedir/FL/images; then
--	CFLAGS="-I$includedir/FL/images $CFLAGS"
--	CXXFLAGS="-I$includedir/FL/images $CXXFLAGS"
-+	CFLAGS="-I$includedir/FL/images"
-+	CXXFLAGS="-I$includedir/FL/images"
- fi
- 
- # libraries to link with:
-@@ -232,8 +229,8 @@
-     LDSTATIC="$libdir/libfltk_images.a $IMAGELIBS $LDSTATIC"
- fi
- 
--LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS"
--LDSTATIC="$LDFLAGS $libs $LDSTATIC"
-+LDLIBS="$DSOLINK $libs $LDLIBS"
-+LDSTATIC="$libs $LDSTATIC"
- 
- # Answer to user requests
- if test -n "$echo_help"; then
diff --git a/x11-libs/fltk/files/libs-1.7.diff b/x11-libs/fltk/files/libs-1.7.diff
deleted file mode 100644
index 7c0b41c..0000000
--- a/x11-libs/fltk/files/libs-1.7.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN fltk-1.1.0rc6/src/Makefile fltk-1.1.0rc6-modified/src/Makefile
---- fltk-1.1.0rc6/src/Makefile	Thu Aug  8 20:09:49 2002
-+++ fltk-1.1.0rc6-modified/src/Makefile	Thu Aug 22 15:16:20 2002
-@@ -405,12 +405,12 @@
- 	-$(MKDIR) $(DESTDIR)$(libdir)
- 	$(RM) $(DESTDIR)$(libdir)/$(LIBNAME)
- 	-$(CP) $(LIBNAME) $(FLLIBNAME) $(GLLIBNAME) $(IMGLIBNAME) $(DESTDIR)$(libdir)
--	$(RANLIB) $(DESTDIR)$(libdir)/$(LIBNAME)
--	$(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBNAME)
--	if test x$(GLLIBNAME) != x; then \
--		$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \
--	fi
--	$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME)
-+	#$(RANLIB) $(DESTDIR)$(libdir)/$(LIBNAME)
-+	#$(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBNAME)
-+	#if test x$(GLLIBNAME) != x; then \
-+	#	$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \
-+	#fi
-+	#$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME)
- 	if test x$(DSONAME) = xlibfltk.so.1.1; then\
- 		$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
- 		$(CP) libfltk.so.1.1 $(DESTDIR)$(libdir); \
diff --git a/x11-libs/fltk/fltk-1.1.7-r1.ebuild b/x11-libs/fltk/fltk-1.1.7-r1.ebuild
deleted file mode 100644
index 34e661c..0000000
--- a/x11-libs/fltk/fltk-1.1.7-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.7.ebuild,v 1.10 2006/08/09 19:49:08 jer Exp $
-
-IUSE="noxft opengl debug"
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="C++ user interface toolkit for X and OpenGL."
-HOMEPAGE="http://www.fltk.org"
-SRC_URI="http://ftp.easysw.com/pub/${PN}/${PV}/${P}-source.tar.bz2"
-
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
-LICENSE="FLTK LGPL-2"
-
-PV_MAJOR=${PV/.*/}
-PV_MINOR=${PV#${PV_MAJOR}.}
-PV_MINOR=${PV_MINOR/.*}
-SLOT="${PV_MAJOR}.${PV_MINOR}"
-
-INCDIR="/usr/include/fltk-${SLOT}"
-LIBDIR="/usr/$(get_libdir)/fltk-${SLOT}"
-
-DEPEND="|| ( (
-		x11-libs/libXext
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXt
-		x11-proto/xextproto )
-	virtual/x11 )
-	!noxft? ( virtual/xft )
-	media-libs/libpng
-	media-libs/jpeg
-	opengl? ( virtual/opengl )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/libs-1.7.diff
-	epatch "${FILESDIR}"/${P}-fltk-config.patch
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-}
-
-src_compile() {
-	local myconf="--enable-shared --enable-xdbe --enable-static --enable-threads"
-
-	if ! use noxft; then
-		myconf="${myconf} --enable-xft"
-	else
-		myconf="${myconf} --disable-xft"
-	fi
-
-	use debug && myconf="${myconf} --enable-debug"
-
-	use opengl || myconf="${myconf} --disable-gl"
-
-	# needed for glibc-2.3.1 (as far as i can test)
-	# otherwise libstdc++ won't be linked. #17894 and #15572
-	# doesn't happen for glibc-2.3.2 - <liquidx@gentoo.org>
-	tc-export CC CXX
-
-	# bug #19894
-	export C_INCLUDE_PATH="${C_INCLUDE_PATH}:/usr/include/freetype2"
-	export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
-
-	econf \
-		--includedir="${INCDIR}"\
-		--libdir="${LIBDIR}" \
-		${myconf} || die "Configuration Failed"
-
-	emake || die "Parallel Make Failed"
-}
-
-src_install() {
-	einstall \
-		includedir="${D}${INCDIR}" \
-		libdir="${D}${LIBDIR}" || die "Installation Failed"
-
-	ranlib "${D}${LIBDIR}"/*.a
-
-	dodoc CHANGES README
-
-	echo "LDPATH=${LIBDIR}" > 99fltk-${SLOT}
-	echo "FLTK_DOCDIR=/usr/share/doc/${PF}/html" >> 99fltk-${SLOT}
-
-	insinto /etc/env.d
-	doins 99fltk-${SLOT}
-
-	dodir /usr/share/doc/${P}/html
-	mv "${D}"/usr/share/doc/fltk/* "${D}"/usr/share/doc/${PF}/html
-	rmdir "${D}"/usr/share/doc/fltk
-	rm -rf "${D}"/usr/share/man/cat{1,3}
-}
-
-pkg_postinst() {
-	ewarn "the xft USE flag has been changed to noxft. this was because most"
-	ewarn "users want xft, but if you do not, be sure to change the flag"
-}