Removing old snapshots. Minor ebuild improvements wrt die messages.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.27-hh7 i686

5 files changed, 16 insertions, 169 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/Manifest b/x11-libs/fltk/Manifest
index 760a6bbccb06..827bb9e892e1 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -8,14 +8,10 @@ AUX fltk2-config.patch 351 RMD160 0283816a6ff89e0f87f5388cd68bc1a366839541 SHA1
 AUX fltk2-nogl.patch 1222 RMD160 18ae618fb0b70678bd811b0c1871bac11230515a SHA1 0e9774c5df1721e468f21a96b5861dcf632c39ff SHA256 97757338e8a8dd9e75efd7b20520696e2b1e588cddb96b710315ddc1acc50faf
 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
-DIST fltk-2.0.x-r6403.tar.bz2 2527429 RMD160 fdd69b25f9be855aae9ab1838e09a441dd112181 SHA1 02ac7bb40ab78b7db9dc1f39b1c59248189b12e6 SHA256 a2779a5231375d5f62ae284dbd6467d9c95a00a64f69a1e2917a376573bafd02
-DIST fltk-2.0.x-r6483.tar.bz2 2527200 RMD160 6c1f8caba3270e4567d70a8368133d6d0e97d180 SHA1 029d795c1c7f59d107430a23870340890c21dd55 SHA256 4b963ba30362fd3bf2604d87ad27979f68aa9542f29abc9726eb835bf2280bd9
 DIST fltk-2.0.x-r6525.tar.bz2 2527295 RMD160 71a2f321b0aab066bceaf327a9234aef6017f1bb SHA1 c880525d398fee850452cefef5b4c9d79315d5c2 SHA256 96e76cac6cc20b77ac3c94153d03b48e447d53bc029ab867e902e1017c72a661
 EBUILD fltk-1.1.7-r2.ebuild 2890 RMD160 7d5c1d2fce93eed2d48d06e640dacc3a4a0fa647 SHA1 f4df4cd0142451be646d4845b02151d005c9197b SHA256 9e9e5674fc2a6969aa4a8a9a57660417cf235576f662561d9c809d370591daea
 EBUILD fltk-1.1.7-r3.ebuild 2944 RMD160 62be64f9615d6c43183e697d7af59c47a4517df2 SHA1 376de943a1ce44b0165a8784e88eb9fd5bf12fb1 SHA256 fd1d7f4241a7aee0b26363122cfca7cf8ceb0b0337fdc8d89e5ff51f6624ad43
 EBUILD fltk-1.1.7.ebuild 2579 RMD160 f561932ed46dd190000ef36f1047ca5d0c4b69c4 SHA1 a5b97ba3f582def4a185dbdfcdb0b4748ebafcbf SHA256 ab83703411a4a50574de3c0c410f88b6abf1ba4f0bff1dae8bc05e24586e177e
-EBUILD fltk-2.0_pre6403.ebuild 1974 RMD160 58da27e766277962f4b60966a5f240ead252b83f SHA1 91315532150f8ae46060c2b823ff268b7c3ec394 SHA256 cf873d34e3a543c9d05f377de66c9fda407c05b47f8b0d9357472dafb5fd5d37
-EBUILD fltk-2.0_pre6483.ebuild 1981 RMD160 c392bed0ae0c2ac8016eed38068800bd63b0ebec SHA1 10cb26feb7312bbc99d2f2f009918083a46e1788 SHA256 451c1e8498132f49a2ed6c926162d32ecb1c7fb9dbe45630d4166050d6b1b3e9
-EBUILD fltk-2.0_pre6525.ebuild 2082 RMD160 85d139e1726e11c3c41aef8720e5457b387c98d4 SHA1 2f44a0b99e40b20e0365d9b646db568d6f267f9b SHA256 c45823f7d3e876f163ecba8df873a5c18345673940fb905032cb0536ce0b92da
-MISC ChangeLog 13584 RMD160 60ce5351cbd0e5ce96d700ef6e60fa99ea2bffc8 SHA1 fe718471b56318fbada20c55d27805a9341e52d5 SHA256 882193172578bb19364e77eee7ddb1c1f496ab2fc1e13c6a074d17029174efd7
+EBUILD fltk-2.0_pre6525.ebuild 2153 RMD160 423e6add102361f295268fd7caee104abcc2dc16 SHA1 7ba2bd9561079b1e592f8dc988dba5c81c2d88a2 SHA256 6a173fe37eb1a82d68d9d9e71ee2914023798b4b7457683ed3a9c127a7e6e151
+MISC ChangeLog 13782 RMD160 8960a7ff1e69ba7b2eb792b8116a853966602639 SHA1 a784a3787bc94a9b02d151bb4851bd4c24acc5f1 SHA256 36c94183760a78fb4b831ea3ea6942663f98aca248bcaf05348f84dec4ae4100
 MISC metadata.xml 495 RMD160 d829d46d1e2704dca473add6d4afce259185b6ce SHA1 c7b657043ccaa447659f02a3beca138c8043645f SHA256 9f8d03594a57ad18f234a5246034c17ec77defbd2c6735beba9442ad668d5c75
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"
 }