Removing old snapshots. Minor ebuild improvements wrt die messages.

(Portage version: 2.2_rc20/cvs/Linux 2.6.27-hh7 i686)

4 files changed, 14 insertions, 163 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 2f8093c889e7..9e0b97789685 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.101 2008/12/15 01:18:55 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.102 2008/12/30 02:18:31 yngwin Exp $
+
+  30 Dec 2008; Ben de Groot <yngwin@gentoo.org> -fltk-2.0_pre6403.ebuild,
+  -fltk-2.0_pre6483.ebuild, fltk-2.0_pre6525.ebuild:
+  Removing old snapshots. Minor ebuild improvements wrt die messages.
 
 *fltk-2.0_pre6525 (15 Dec 2008)
 
diff --git a/x11-libs/fltk/fltk-2.0_pre6403.ebuild b/x11-libs/fltk/fltk-2.0_pre6403.ebuild
deleted file mode 100644
index 7c434f2d340a..000000000000
--- a/x11-libs/fltk/fltk-2.0_pre6403.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-2.0_pre6403.ebuild,v 1.1 2008/10/21 13:50:51 yngwin Exp $
-
-EAPI="1"
-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="~amd64 ~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? ( virtual/xft )
-	png? ( media-libs/libpng )
-	jpeg? ( media-libs/jpeg )
-	opengl? ( virtual/opengl )
-	cairo? ( x11-libs/cairo )
-	xinerama? ( x11-libs/libXinerama )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/fltk2-config.patch
-	use opengl || epatch "${FILESDIR}"/fltk2-nogl.patch
-	eautoreconf
-}
-
-src_compile() {
-	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) \
-		|| die "configure failed"
-
-	emake || die "make failed"
-	use doc && make -C documentation
-}
-
-src_install() {
-	einstall includedir="${D}/usr/include" \
-		libdir="${D}/usr/$(get_libdir)/fltk" || die "install failed"
-
-	if use doc; then
-		emake -C documentation install || die "install documentation failed"
-		dohtml documentation/html
-	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}
-}
diff --git a/x11-libs/fltk/fltk-2.0_pre6483.ebuild b/x11-libs/fltk/fltk-2.0_pre6483.ebuild
deleted file mode 100644
index 7b9dd4976f80..000000000000
--- a/x11-libs/fltk/fltk-2.0_pre6483.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-2.0_pre6483.ebuild,v 1.2 2008/11/23 18:24:45 fmccor Exp $
-
-EAPI="1"
-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="~amd64 ~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? ( virtual/xft )
-	png? ( media-libs/libpng )
-	jpeg? ( media-libs/jpeg )
-	opengl? ( virtual/opengl )
-	cairo? ( x11-libs/cairo )
-	xinerama? ( x11-libs/libXinerama )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/fltk2-config.patch
-	use opengl || epatch "${FILESDIR}"/fltk2-nogl.patch
-	eautoreconf
-}
-
-src_compile() {
-	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) \
-		|| die "configure failed"
-
-	emake || die "make failed"
-	use doc && make -C documentation
-}
-
-src_install() {
-	einstall includedir="${D}/usr/include" \
-		libdir="${D}/usr/$(get_libdir)/fltk" || die "install failed"
-
-	if use doc; then
-		emake -C documentation install || die "install documentation failed"
-		dohtml documentation/html
-	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}
-}
diff --git a/x11-libs/fltk/fltk-2.0_pre6525.ebuild b/x11-libs/fltk/fltk-2.0_pre6525.ebuild
index f87774df690e..919e8d08c2f1 100644
--- a/x11-libs/fltk/fltk-2.0_pre6525.ebuild
+++ b/x11-libs/fltk/fltk-2.0_pre6525.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-2.0_pre6525.ebuild,v 1.1 2008/12/15 01:18:55 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-2.0_pre6525.ebuild,v 1.2 2008/12/30 02:18:31 yngwin Exp $
 
 EAPI="1"
 inherit multilib autotools flag-o-matic
@@ -55,25 +55,26 @@ src_compile() {
 		$(use_enable jpeg) \
 		$(use_enable png) \
 		$(use_enable xinerama) \
-		$(use_enable zlib) \
-		|| die "configure failed"
+		$(use_enable zlib)
 
 	emake || die "make failed"
-	use doc && make -C documentation
+
+	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" || die "install failed"
+	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/*
+		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}
+	doenvd 99fltk-${SLOT} || die "installing env.d file failed"
 }