4 files changed, 16 insertions, 85 deletions
diff --git a/media-libs/libcaca/ChangeLog b/media-libs/libcaca/ChangeLog
index 846e2e24d89d..5b463b3b1d20 100644
--- a/media-libs/libcaca/ChangeLog
+++ b/media-libs/libcaca/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libcaca
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.79 2009/08/09 12:40:39 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.80 2009/08/10 09:55:06 aballier Exp $
+
+  10 Aug 2009; Alexis Ballier <aballier@gentoo.org>
+  -libcaca-0.99_beta14.ebuild, -files/libcaca-0.99_beta14-nogl.patch:
+  remove old
 
   09 Aug 2009; nixnut <nixnut@gentoo.org> libcaca-0.99_beta16.ebuild:
   ppc stable #275907
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index f55457962a81..8e1afaaec971 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -1,8 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libcaca-0.99_beta14-deoptimise.patch 1100 RMD160 efd20e164f76b72c3d64aee9c7a8861bdbab948f SHA1 cfa3042e083417c70bea9f3569b5f911e8603c27 SHA256 a1d840015ca2f35513b7fea2c3744b8840de166294ef4691e2a7a262eccb0372
-AUX libcaca-0.99_beta14-nogl.patch 493 RMD160 49580ad7fc4b30e41677b8e0b579dfacedde6b42 SHA1 3b70a2675d7d943c2bc6c97373a7ee9c76924a61 SHA256 1834336705e595bd4e6f3055e54d192c5b25bd755109c5d977b097938d542ae6
-DIST libcaca-0.99.beta14.tar.gz 973834 RMD160 487afcca9c60c2bf3ffa3005d241554c992c704d SHA1 9deb40d2b7ab2273580b16b13a231d3041a3b5c5 SHA256 c9491a4deb5bd610b03bff79dbb146aea28438418fd940c488976e4975e31e00
 DIST libcaca-0.99.beta16.tar.gz 966593 RMD160 fdfc9ab7edb2144f1b78620486d897d72c1cfa66 SHA1 894c8aa86bacb40154efaa8e4be9794ce0c3d7b9 SHA256 ca4c931cbed4bc4d8cbc942db91a7ff0ff5e0a4daec66eb2f274779918b64acc
-EBUILD libcaca-0.99_beta14.ebuild 1766 RMD160 7349c2681ef6c2aefd2896b36a6f0fd9f1cf7427 SHA1 ccdba201f3f3cb6ffae0459471de7ee45bdaa04c SHA256 1571e20d8b58ccd00457c0bb34eabf539ec4c3350d3d99d0b2d29bce98824169
 EBUILD libcaca-0.99_beta16.ebuild 1730 RMD160 8e228ff124eed21c6534f20576e1ca5380ecd367 SHA1 8941dabd63053aee0defea05e02086979e08fc33 SHA256 d1ff6dcfc1af00690b82ad8ccdd274fd33158a6e3b6ff492d5301f689d6b3585
-MISC ChangeLog 11487 RMD160 14f8d16dc80bb2ff306ae5fb469c9eda73d2bda6 SHA1 4be71aec29df3260b76564e7bcfcb3d0bc090382 SHA256 454b5e8a2eba415d21d5f1f41742552058cd6214d4086b6759ca14f7157a0c9a
+MISC ChangeLog 11625 RMD160 4e7a0419e58119ba4e8252b0cf45f52c1895a2a8 SHA1 78573baba8ed0aafd78bf49af358e2463cdbd078 SHA256 e9e1ffe1cda07f815a3ed1782dcf1afcdce897586985fb1c638456741b0d14cc
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkp/7oQACgkQvFcC4BYPU0oUOwCgvAELOOvcmzKRX7cq92Dfs0HC
+4AcAoLH6Dpf2eQjTjgaOEgRqwFw8uX5q
+=LmuT
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libcaca/files/libcaca-0.99_beta14-nogl.patch b/media-libs/libcaca/files/libcaca-0.99_beta14-nogl.patch
deleted file mode 100644
index 26d8899fafd2..000000000000
--- a/media-libs/libcaca/files/libcaca-0.99_beta14-nogl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 2538)
-+++ configure.ac	(revision 2539)
-@@ -218,8 +218,8 @@
-     AC_MSG_ERROR([cannot find OpenGL+FreeGLUT development files])
-   fi
-   PKG_CHECK_MODULES(FTGL, ftgl >= 2.1.3, [FTGL="yes"], [FTGL="no"])
--  AM_CONDITIONAL(USE_FTGL, test "${FTGL}" = "yes")
- fi
-+AM_CONDITIONAL(USE_FTGL, test "${FTGL}" = "yes")
- 
- if test "${enable_cocoa}" != "no"; then
-   ac_cv_my_have_cocoa="no"
diff --git a/media-libs/libcaca/libcaca-0.99_beta14.ebuild b/media-libs/libcaca/libcaca-0.99_beta14.ebuild
deleted file mode 100644
index ef8050ac454a..000000000000
--- a/media-libs/libcaca/libcaca-0.99_beta14.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta14.ebuild,v 1.10 2009/05/30 09:22:16 ulm Exp $
-
-inherit eutils autotools libtool mono
-
-MY_P="${P/_beta/.beta}"
-
-DESCRIPTION="A library that creates colored ASCII-art graphics"
-HOMEPAGE="http://libcaca.zoy.org/"
-SRC_URI="http://libcaca.zoy.org/files/${PN}/${MY_P}.tar.gz"
-
-LICENSE="WTFPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc imlib mono ncurses nocxx opengl ruby slang X"
-
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.3 )
-	slang? ( >=sys-libs/slang-1.4 )
-	imlib? ( media-libs/imlib2 )
-	X? ( x11-libs/libX11 x11-libs/libXt )
-	opengl? ( virtual/opengl media-libs/freeglut )
-	mono? ( dev-lang/mono )
-	ruby? ( virtual/ruby )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen
-		virtual/latex-base
-		|| ( dev-texlive/texlive-fontsrecommended app-text/ptex ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-0.99_beta14-deoptimise.patch"
-	epatch "${FILESDIR}/${P}-nogl.patch"
-
-	eautoreconf
-	elibtoolize
-}
-
-src_compile() {
-	# temp font fix #44128
-	export VARTEXFONTS="${T}/fonts"
-
-	econf \
-		$(use_enable doc) \
-		$(use_enable ncurses) \
-		$(use_enable slang) \
-		$(use_enable imlib imlib2) \
-		$(use_enable X x11) $(use_with X x) --x-libraries=/usr/$(get_libdir) \
-		$(use_enable opengl gl) \
-		$(use_enable !nocxx cxx) \
-		$(use_enable mono csharp) \
-		$(use_enable ruby) \
-		|| die "econf failed"
-	emake || die "emake failed"
-	unset VARTEXFONTS
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS NOTES README
-}