As Alexis Ballier pointed out, libcucul got merged into libcaca starting from 0.99_beta16. Reflect this situation in ebuilds.

(Portage version: 2.2_rc15/cvs/Linux 2.6.27-gentoo-r3 i686)

5 files changed, 65 insertions, 4 deletions

diff --git a/app-misc/toilet/ChangeLog b/app-misc/toilet/ChangeLog
index 8614d77c2ed2..556d0bc5752a 100644
--- a/app-misc/toilet/ChangeLog
+++ b/app-misc/toilet/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/toilet
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/toilet/ChangeLog,v 1.9 2008/11/25 08:20:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/toilet/ChangeLog,v 1.10 2008/11/25 16:34:17 ssuominen Exp $
+
+*toilet-0.1-r1 (25 Nov 2008)
+
+  25 Nov 2008; <ssuominen@gentoo.org>
+  files/toilet-0.1-asneeded-and-cflags.patch,
+  +files/toilet-0.1-asneeded-and-cflags-2.patch, toilet-0.1.ebuild,
+  +toilet-0.1-r1.ebuild:
+  As Alexis Ballier pointed out, libcucul got merged into libcaca starting
+  from 0.99_beta16. Reflect this situation in ebuilds.
 
   25 Nov 2008; <ssuominen@gentoo.org>
   files/toilet-0.1-asneeded-and-cflags.patch:
diff --git a/app-misc/toilet/files/toilet-0.1-asneeded-and-cflags-2.patch b/app-misc/toilet/files/toilet-0.1-asneeded-and-cflags-2.patch
new file mode 100644
index 000000000000..08f3bf726382
--- /dev/null
+++ b/app-misc/toilet/files/toilet-0.1-asneeded-and-cflags-2.patch
@@ -0,0 +1,22 @@
+diff -ur toilet-0.1.orig/configure.ac toilet-0.1/configure.ac
+--- toilet-0.1.orig/configure.ac	2006-11-16 02:26:50.000000000 +0200
++++ toilet-0.1/configure.ac	2007-08-12 01:00:20.000000000 +0300
+@@ -67,7 +67,7 @@
+ AC_DEFINE_UNQUOTED(DATE, "$ac_build_date", [Define the version date])
+ 
+ # Optimizations
+-CFLAGS="${CFLAGS} -g -O2 -fno-strength-reduce -fomit-frame-pointer"
++CFLAGS="${CFLAGS} -fno-strength-reduce"
+ # Code qui fait des warnings == code de porc == deux baffes dans ta gueule
+ CFLAGS="${CFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare"
+ 
+diff -ur toilet-0.1.orig/src/Makefile.am toilet-0.1/src/Makefile.am
+--- toilet-0.1.orig/src/Makefile.am	2006-11-10 12:47:29.000000000 +0200
++++ toilet-0.1/src/Makefile.am	2007-08-12 01:02:15.000000000 +0300
+@@ -9,5 +9,4 @@
+ 	term.c figlet.c
+ toilet_CPPFLAGS = -DFONTDIR=\"$(datadir)/figlet\"
+ toilet_CFLAGS = `pkg-config --cflags cucul`
+-toilet_LDFLAGS = `pkg-config --libs cucul` @GETOPT_LIBS@ @ZLIB_LIBS@
+-
++toilet_LDADD = -lcaca @GETOPT_LIBS@ @ZLIB_LIBS@
diff --git a/app-misc/toilet/files/toilet-0.1-asneeded-and-cflags.patch b/app-misc/toilet/files/toilet-0.1-asneeded-and-cflags.patch
index 08f3bf726382..5fdf0c1993a4 100644
--- a/app-misc/toilet/files/toilet-0.1-asneeded-and-cflags.patch
+++ b/app-misc/toilet/files/toilet-0.1-asneeded-and-cflags.patch
@@ -19,4 +19,4 @@ diff -ur toilet-0.1.orig/src/Makefile.am toilet-0.1/src/Makefile.am
  toilet_CFLAGS = `pkg-config --cflags cucul`
 -toilet_LDFLAGS = `pkg-config --libs cucul` @GETOPT_LIBS@ @ZLIB_LIBS@
 -
-+toilet_LDADD = -lcaca @GETOPT_LIBS@ @ZLIB_LIBS@
++toilet_LDADD = -lcucul @GETOPT_LIBS@ @ZLIB_LIBS@
diff --git a/app-misc/toilet/toilet-0.1-r1.ebuild b/app-misc/toilet/toilet-0.1-r1.ebuild
new file mode 100644
index 000000000000..d1344f6448fc
--- /dev/null
+++ b/app-misc/toilet/toilet-0.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/toilet/toilet-0.1-r1.ebuild,v 1.1 2008/11/25 16:34:17 ssuominen Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="The Other Implementations letters. Figlet replacement."
+HOMEPAGE="http://libcaca.zoy.org/toilet.html"
+SRC_URI="http://libcaca.zoy.org/files/${P}.tar.gz"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libcaca-0.99_beta16"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-asneeded-and-cflags-2.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc ChangeLog NEWS README TODO
+}
diff --git a/app-misc/toilet/toilet-0.1.ebuild b/app-misc/toilet/toilet-0.1.ebuild
index c8ecf7b436a5..c1853944e673 100644
--- a/app-misc/toilet/toilet-0.1.ebuild
+++ b/app-misc/toilet/toilet-0.1.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/app-misc/toilet/toilet-0.1.ebuild,v 1.9 2008/10/27 05:48:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/toilet/toilet-0.1.ebuild,v 1.10 2008/11/25 16:34:17 ssuominen Exp $
 
 inherit autotools eutils
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 arm ~ppc ~sparc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="media-libs/libcaca"
+RDEPEND="<media-libs/libcaca-0.99_beta16"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"