[gentoo-commits] gentoo-x86 commit in x11-libs/fltk: ChangeLog fltk-2.0_pre6525.ebuild fltk-2.0_pre6483.ebuild fltk-2.0_pre6403.ebuild

[gentoo-commits] gentoo-x86 commit in x11-libs/fltk: ChangeLog fltk-2.0_pre6525.ebuild fltk-2.0_pre6483.ebuild fltk-2.0_pre6403.ebuild

[Ben de Groot (yngwin)]

yngwin      08/12/30 02:18:31

  Modified:             ChangeLog fltk-2.0_pre6525.ebuild
  Removed:              fltk-2.0_pre6483.ebuild fltk-2.0_pre6403.ebuild
  Log:
  Removing old snapshots. Minor ebuild improvements wrt die messages.
  (Portage version: 2.2_rc20/cvs/Linux 2.6.27-hh7 i686)

Revision  Changes    Path
1.102                x11-libs/fltk/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/fltk/ChangeLog?rev=1.102&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/fltk/ChangeLog?rev=1.102&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/fltk/ChangeLog?r1=1.101&r2=1.102

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- ChangeLog	15 Dec 2008 01:18:55 -0000	1.101
+++ ChangeLog	30 Dec 2008 02:18:31 -0000	1.102
@@ -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)
 



1.2                  x11-libs/fltk/fltk-2.0_pre6525.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/fltk/fltk-2.0_pre6525.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/fltk/fltk-2.0_pre6525.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/fltk/fltk-2.0_pre6525.ebuild?r1=1.1&r2=1.2

Index: fltk-2.0_pre6525.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-2.0_pre6525.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fltk-2.0_pre6525.ebuild	15 Dec 2008 01:18:55 -0000	1.1
+++ fltk-2.0_pre6525.ebuild	30 Dec 2008 02:18:31 -0000	1.2
@@ -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 @@
 		$(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"
 }