old

(Portage version: 2.2.0_alpha70/cvs/Linux x86_64)

3 files changed, 5 insertions, 154 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index d44db1685a70..9dc5acd77a3c 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.194 2011/10/23 15:37:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.195 2011/10/23 15:40:58 ssuominen Exp $
+
+  23 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -fltk-1.1.9-r1.ebuild,
+  -files/fltk-1.1.9-consts.patch:
+  old
 
   23 Oct 2011; Raúl Porcel <armin76@gentoo.org> fltk-1.1.10-r2.ebuild:
   alpha/ia64/sparc stable wrt #385195
diff --git a/x11-libs/fltk/files/fltk-1.1.9-consts.patch b/x11-libs/fltk/files/fltk-1.1.9-consts.patch
deleted file mode 100644
index 1ca0d84c9fc4..000000000000
--- a/x11-libs/fltk/files/fltk-1.1.9-consts.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ru fltk-1.1.9.orig/src/fl_set_fonts_xft.cxx fltk-1.1.9/src/fl_set_fonts_xft.cxx
---- fltk-1.1.9.orig/src/fl_set_fonts_xft.cxx	2009-03-04 10:58:49.000000000 +0000
-+++ fltk-1.1.9/src/fl_set_fonts_xft.cxx	2009-03-04 11:01:25.000000000 +0000
-@@ -253,13 +253,13 @@
-       // So the bit we want is up to the first comma - BUT some strings have
-       // more than one name, separated by, guess what?, a comma...
-       stop = start = first = 0;
--      stop = strchr((const char *)font, ',');
--      start = strchr((const char *)font, ':');
-+      stop = strchr((char *)font, ',');
-+      start = strchr((char *)font, ':');
-       if ((stop) && (start) && (stop < start))
-       {
-         first = stop + 1; // discard first version of name
-         // find first comma *after* the end of the name
--        stop = strchr((const char *)start, ',');
-+        stop = strchr((char *)start, ',');
-       }
-       else
-       {
diff --git a/x11-libs/fltk/fltk-1.1.9-r1.ebuild b/x11-libs/fltk/fltk-1.1.9-r1.ebuild
deleted file mode 100644
index faa26c2a0568..000000000000
--- a/x11-libs/fltk/fltk-1.1.9-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2011 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.19 2011/05/01 17:14:33 armin76 Exp $
-
-EAPI=2
-inherit eutils autotools versionator fdo-mime
-
-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 ~arm hppa ia64 ppc ppc64 sparc x86"
-LICENSE="FLTK LGPL-2"
-
-SLOT="1"
-
-IUSE="doc examples games opengl threads xft xinerama"
-
-RDEPEND="x11-libs/libXext
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXt
-	virtual/jpeg
-	media-libs/libpng
-	sys-libs/zlib
-	opengl? ( virtual/opengl )
-	xinerama? ( x11-libs/libXinerama )
-	xft? ( x11-libs/libXft )
-	>=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}
-
-src_prepare() {
-	#epatch "${FILESDIR}"/${P}-fromdebian.patch
-	epatch "${FILESDIR}"/${P}-desktop.patch
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	# prevent to run twice configure (needs eautoconf), to compile tests,
-	# remove forced -Os compile
-	epatch "${FILESDIR}"/${P}-conf-tests.patch
-	# fix stricter c++ handling in glibc-2.10/gcc-4.4 (bug 270487)
-	epatch "${FILESDIR}"/${P}-glibc2.10-scandir.patch
-	epatch "${FILESDIR}"/${P}-consts.patch
-	# remove forced flags from fltk-config
-	sed -i \
-		-e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \
-		-e '/^LDFLAGS=/d' \
-		"${S}/fltk-config.in" || die
-	# some fixes introduced because slotting
-	sed -i \
-		-e '/RANLIB/s:$(libdir)/\(.*LIBNAME)\):$(libdir)/`basename \1`:g' \
-		src/Makefile || die
-	# docs in proper docdir
-	sed -i \
-		-e "/^docdir/s:fltk:${PF}/html:" \
-		makeinclude.in || die
-	sed -e "s/7/$(get_version_component_range 3)/" \
-		"${FILESDIR}"/FLTKConfig.cmake > CMake/FLTKConfig.cmake
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		--includedir=${INCDIR}\
-		--libdir=${LIBDIR} \
-		--docdir=/usr/share/doc/${PF}/html \
-		--enable-largefile \
-		--enable-shared \
-		--enable-xdbe \
-		$(use_enable opengl gl) \
-		$(use_enable threads) \
-		$(use_enable xft) \
-		$(use_enable xinerama)
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use doc; then
-		cd "${S}"/documentation
-		emake alldocs || die "emake doc failed"
-	fi
-	if use games; then
-		cd "${S}"/test
-		emake blocks checkers sudoku || die "emake games failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	emake -C fluid \
-			DESTDIR="${D}" install-linux || die "emake install fluid failed"
-	if use doc; then
-		emake -C documentation \
-			DESTDIR="${D}" install || die "emake install doc failed"
-	fi
-	local apps="fluid"
-	if use games; then
-		emake -C test \
-			DESTDIR="${D}" install-linux || die "emake install games failed"
-		emake -C documentation \
-			DESTDIR="${D}" install-linux || die "emake install doc games failed"
-		apps="${apps} sudoku blocks checkers"
-	fi
-	for app in ${apps}; do
-		dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
-			/usr/share/pixmaps/${app}.png
-	done
-	dodoc CHANGES README CREDITS ANNOUNCEMENT
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins test/*.{h,cxx,fl} test/demo.menu
-	fi
-
-	insinto /usr/share/cmake/Modules
-	doins CMake/FLTK*.cmake
-
-	echo "LDPATH=${LIBDIR}" > 99fltk-${SLOT}
-	echo "FLTK_DOCDIR=/usr/share/doc/${PF}/html" >> 99fltk-${SLOT}
-	doenvd 99fltk-${SLOT}
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}