old

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 49df67b159c77166963ed0f88ca89b52b8901fef..4c5af03659354ba436905afcfa48db8296fb6ae9 100644 (file)
--- 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/Manifest b/x11-libs/fltk/Manifest
index 6702904571a727c6fae27aec27b7724dcd4ca6a3..5b94a3356cd8fd1772f0bc39b36668e13c223412 100644 (file)
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -26,13 +26,16 @@ DIST fltk-2.0.x-r6970.tar.bz2 2529193 RMD160 5d114b5861807a15638d2b0f7ac55a909c1
 EBUILD fltk-1.1.10-r2.ebuild 3942 RMD160 3830067c2398c4f7b173e5077238c28ec7a46dc2 SHA1 db75d7a264e8da18025ceeebffbc61cd381a19ae SHA256 ceba5578b659ca6eb51bbc3ed805e65d331685162060e60e1fba2d542954b6a4
 EBUILD fltk-1.3.0.ebuild 3851 RMD160 62477c2590f66ec3e4b1f1b7013b0d7a45592649 SHA1 36a90ccf20ffeb5bd988b6ef61e1b6fba2ae13ff SHA256 69efd0b91729c31335876d76920c5d01ec639b4a598c85ba1e9c738ef9bda7a0
 EBUILD fltk-2.0_pre6970-r1.ebuild 2635 RMD160 6aa61a9e0af5546123ad515e5b6d2f9d650c4b59 SHA1 257bc6d9cf8ebf68621b411a72b37705a13b082a SHA256 2f1de8727ab54f968c857741e27d983718b786d8e2cd976d226ba59ddedc2eb1
-EBUILD fltk-2.0_pre6970.ebuild 2499 RMD160 473e33748481ede77d977856375059b48994667e SHA1 d4b27ae1b48a9573104cd62ca106ad2ff9359acb SHA256 9151a4aaf72a4d22301cd16c8cf06461410a5121939162347da14c3106c4bffd
-MISC ChangeLog 27747 RMD160 ae303cdd93919103484b668d326f4d8fee47f52c SHA1 809fa537402616accb53e728c639ef75133392fc SHA256 e68e6cd0eaf12cf4c36744e7f1c2bf343798505aebc1cb3e4cb8322a7adfe99e
+MISC ChangeLog 27775 RMD160 3418897fb9202d1c109ca5dcedb06dbdac48c988 SHA1 18bc19036e2232054940952ca1d7ac53aed537c6 SHA256 3659d1e7f700ef71f9f05b60e6952bb4467cfbec882a9689673a1de86a292557
 MISC metadata.xml 657 RMD160 24969ef07785738fc34d10c79dcc854d2a895ec3 SHA1 8afd06ddc3b01090acf0333f2ac41fc4a692f504 SHA256 f37b711686e55a32ab4a1e050ee6e98fbfd7e6d7839c53926b6103fff61c44b1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6kQFoACgkQuQc30/atMkAgwwCfeWbCDsQd9bltZyuvkQim233a
-XHAAoKwVCWaq2I0EviMwrqOFvPxeAXBq
-=XIQh
+iQEcBAEBAgAGBQJOpEHMAAoJEEdUh39IaPFN5mkIAIUrShsPCK06dqPw15swUiCR
+2iSad/eTWtK+XnpGk3Ga7qk4zs2gRPlbSb50UwPH19Q0Ysr6QhFbtM93wXAm1xe+
+CUiv4UI/npyAV9ABEP23YRFDdT5Nvs/gBrQsGQQCkgA12046/GqAv3n3bTixQn5c
+B+OsagSQkoQQSnvC8ZmDpV6jD5lYsS96FKzBaib4EMBDyw+QJRcY5ix7zZCS72zC
+Zlxwm9Sg09rF6Jvsu/TyS2ztWUFj5MuepJzGxdQI2Qiyd1rKXHRpU82V4CZIgkit
+bG2YZoGMz6Jor3Kzh907HeMllo9LIjh+U3bsT3bvP1r8nA5nI2epQ9+kPCvFpt8=
+=XtAL
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/fltk/fltk-2.0_pre6970.ebuild b/x11-libs/fltk/fltk-2.0_pre6970.ebuild
deleted file mode 100644 (file)
index 8f861cf..0000000
--- 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"
-}