old

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

2 files changed, 5 insertions, 92 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 49df67b159c7..4c5af0365935 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,14 +1,14 @@
 # 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.196 2011/10/23 16:26:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.197 2011/10/23 16:34:01 ssuominen Exp $
+
+  23 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -fltk-2.0_pre6970.ebuild,
+  -fltk-1.1.9-r1.ebuild, -files/fltk-1.1.9-consts.patch:
+  old
 
   23 Oct 2011; Raúl Porcel <armin76@gentoo.org> fltk-2.0_pre6970-r1.ebuild:
   alpha/ia64/sparc stable wrt #387329
 
-  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/fltk-2.0_pre6970.ebuild b/x11-libs/fltk/fltk-2.0_pre6970.ebuild
deleted file mode 100644
index 8f861cfaea62..000000000000
--- a/x11-libs/fltk/fltk-2.0_pre6970.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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-2.0_pre6970.ebuild,v 1.9 2010/11/08 12:50:02 nelchael Exp $
-
-EAPI="2"
-inherit multilib autotools flag-o-matic
-
-MY_P=${P/_pre/.x-r}
-DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="http://www.fltk.org/"
-SRC_URI="mirror://easysw/fltk/snapshots/${MY_P}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 sparc x86"
-LICENSE="FLTK LGPL-2"
-SLOT="2"
-IUSE="cairo debug doc +jpeg +png opengl +xft xinerama zlib"
-
-RDEPEND="x11-libs/libXext
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXt
-	xft? ( x11-libs/libXft )
-	png? ( media-libs/libpng )
-	jpeg? ( virtual/jpeg )
-	opengl? ( virtual/opengl )
-	cairo? ( x11-libs/cairo )
-	xinerama? ( x11-libs/libXinerama )
-	zlib? ( sys-libs/zlib )
-	>=sys-libs/glibc-2.10"   # glibc-2.10 patch breaks with 2.9, bug 276695
-DEPEND="${RDEPEND}
-	x11-misc/makedepend
-	x11-proto/xextproto
-	x11-libs/libXi
-	xinerama? ( x11-proto/xineramaproto )
-	cairo? ( dev-util/pkgconfig )
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/fltk2-asneeded.patch  # bug 255494
-	epatch "${FILESDIR}"/fltk2-gcc43.patch
-	epatch "${FILESDIR}"/fltk2-ldflags.patch  # bug 251233
-	epatch "${FILESDIR}"/fltk2-fluid2.patch  # bug 282472
-	epatch "${FILESDIR}"/${P}-libpng14.patch
-	sed -i "/STRIP/d" fluid/Makefile  # don't pre-strip, bug 246694
-	use opengl || epatch "${FILESDIR}"/fltk2-nogl.patch
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	CPPFLAGS="${CPPFLAGS} -DFLTK_DOCDIR=\"/usr/share/doc/${PF}\"" \
-	econf --enable-shared --enable-threads \
-		$(use_enable debug) \
-		$(use_enable xft) \
-		$(use_enable opengl gl) \
-		$(use_enable cairo) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable xinerama) \
-		$(use_enable zlib)
-}
-
-src_compile() {
-	emake || die "make failed"
-
-	if use doc; then
-		make -C documentation || die "make documentation failed"
-	fi
-}
-
-src_install() {
-	einstall includedir="${D}/usr/include" libdir="${D}/usr/$(get_libdir)/fltk"
-
-	if use doc; then
-		emake -C documentation install || die "install documentation failed"
-		dohtml -r documentation/html/* || die "install html documentation failed"
-	fi
-	dodoc CHANGES CREDITS README* TODO
-
-	echo "LDPATH=/usr/$(get_libdir)/fltk" > 99fltk-${SLOT}
-	echo "FLTK_DOCDIR=/usr/share/doc/${PF}/html" >> 99fltk-${SLOT}
-
-	doenvd 99fltk-${SLOT} || die "installing env.d file failed"
-}