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

Package-Manager: portage-2.2_rc15/cvs/Linux 2.6.27-gentoo-r3 i686

6 files changed, 70 insertions, 7 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/Manifest b/app-misc/toilet/Manifest
index b82f122a64c6..e91fa1246d9c 100644
--- a/app-misc/toilet/Manifest
+++ b/app-misc/toilet/Manifest
@@ -1,5 +1,7 @@
-AUX toilet-0.1-asneeded-and-cflags.patch 1117 RMD160 735d59fea180cfad2908fd76ebc620857c51eb41 SHA1 30eb0930cc5f92394f03a18385d17705c6e7ed08 SHA256 e2c00516e85e006a896d842d66f5e95dc1b0935bcf6872b7dbf53aaa00e2c990
+AUX toilet-0.1-asneeded-and-cflags-2.patch 1117 RMD160 735d59fea180cfad2908fd76ebc620857c51eb41 SHA1 30eb0930cc5f92394f03a18385d17705c6e7ed08 SHA256 e2c00516e85e006a896d842d66f5e95dc1b0935bcf6872b7dbf53aaa00e2c990
+AUX toilet-0.1-asneeded-and-cflags.patch 1118 RMD160 9a18d091f7b0086752a686481f7d76a5e36cb0cd SHA1 a2b7af263d0fd74699376864129348fd7a56c2ed SHA256 9bb26489aad898e30ec6b676bd416fa062eded36653fb867697c5d321eb3a5e6
 DIST toilet-0.1.tar.gz 429493 RMD160 eca05221d5e5b30a3ccc7c16be875a952d0ae793 SHA1 103e64e2bec848e49e2109dea5adb19a751ed721 SHA256 626663a5dbed9c1c5844480b91812f0be4fe8c3c0135f44ef76490f79632d2da
-EBUILD toilet-0.1.ebuild 783 RMD160 580c05f781220db9526b73636b83e9ed48c96e9d SHA1 57e49d233db75b488dc77a9313d0d782385e4f92 SHA256 3e2a6714015d8be1f37ad157c3a244350e5e553b7cbed9cb5c768baef5ac99a9
-MISC ChangeLog 1387 RMD160 f97f2b10a9de9d2bbf050b3bc4d0c17f0b0821ad SHA1 e20e4286293ef59a07a707b9867ef1f80d8c1069 SHA256 408613593246646dc58d03ab5ad10c4b1641060ac7dd5e544ae1c19e485102f2
+EBUILD toilet-0.1-r1.ebuild 808 RMD160 b574606f3660634063234f846989e05b65321110 SHA1 889a065bc10a83fb0a6df8c68cceb016a8ccfdb8 SHA256 d1658d69e9dd8b3b185a79442fb14fb1a5a14c347db1ab5d1437d5b252e336eb
+EBUILD toilet-0.1.ebuild 800 RMD160 df28d53c3444476626de2d3cde08228cae5579cc SHA1 f5ffbe7bfb89e181beb4a328bb06e8c307d933c2 SHA256 86c671b2bf01bde7470d680be4a7cf8891613d520721e76ba61fff5ff5d9a0c6
+MISC ChangeLog 1726 RMD160 64568cb4651302489c399413b374525bee7125cd SHA1 274cc999359aa30bec83c332636e5019c1fed3ee SHA256 919d4b89ec85cda01e9a9e2774de4d9b2836a8a40c007a3ba4062095ba9fc7c0
 MISC metadata.xml 228 RMD160 711ba636f4e544ee43b56a5e2f6e2b385b3a54b6 SHA1 cb84aac4210de3076c38692ce64836b1991fcce8 SHA256 ef226d517277e0362aa2169caa307280ebb63f24d75b9883942aaa8fafa59df7
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"