fix build of ruby bindings on a system without libcaca installed, by Arfrever Frehtes Taifersar Arahesis, bug #213170

Package-Manager: portage-2.1.5_rc10

4 files changed, 27 insertions, 7 deletions

diff --git a/media-libs/libcaca/ChangeLog b/media-libs/libcaca/ChangeLog
index 4e4455b09f85..44261205b99f 100644
--- a/media-libs/libcaca/ChangeLog
+++ b/media-libs/libcaca/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libcaca
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.59 2008/05/12 08:16:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.60 2008/05/12 08:27:04 aballier Exp $
+
+  12 May 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/libcaca-0.99_beta13-ruby-Makefile.am.patch,
+  libcaca-0.99_beta13.ebuild:
+  fix build of ruby bindings on a system without libcaca installed, by
+  Arfrever Frehtes Taifersar Arahesis, bug #213170
 
   12 May 2008; Alexis Ballier <aballier@gentoo.org>
   libcaca-0.99_beta13.ebuild:
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index 0e2007a6486d..2e29ab1d1e06 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -2,17 +2,18 @@
 Hash: SHA1
 
 AUX libcaca-0.99_beta13-gcc-4.3.patch 382 RMD160 3c8cc21466b804e24d1facbd9b7dcc87af04bcfb SHA1 6707a1f9ebf06b4a3fead270209e503fe3b0fc65 SHA256 70021d8683ff5b428f7eff518b690d8f27154a36c5d59634e40f6eb9e9bcf9a7
+AUX libcaca-0.99_beta13-ruby-Makefile.am.patch 394 RMD160 d6f2eda556d1b6e4e935db9d92cec1281f0244a9 SHA1 f1fa1b16003678ddd284f6f1afaf77e424ca0fa0 SHA256 ce0e8ff685e05a64a510effecdad80a670b268f9a2c3f0cb6ecf6ddf0a05cc14
 AUX libcaca-0.99_beta4-deoptimise.patch 946 RMD160 c20434fcdbcf9345ae0862d7c235279add4a9acb SHA1 b66f86e03cc38f1b98486f55c4b1ea9cac5704bb SHA256 532edfc8702337b0e007eb9e82454094717ee923197203f82f67bc0584fdf738
 DIST libcaca-0.99.beta11.tar.gz 774028 RMD160 96ee9953632bbb498f962fad58789d8544b9d562 SHA1 b61eb8df65ea59be707897d9e45d7f8addc55aca SHA256 a751ffecd96416d9e13d9676bb2abbe9fad25d1c62dc11ef6013e1badccc40ce
 DIST libcaca-0.99.beta13.tar.gz 949362 RMD160 a39f0efc00db81bbd6820c4f52dec5e4f8ca3135 SHA1 8061d69a6a7f141aeb44f4d65f015bf5142115b2 SHA256 49544424f101c66780c06f318d63cd7a66454bbf4d95d46ddec47a0cc538a742
 EBUILD libcaca-0.99_beta11.ebuild 1560 RMD160 581a7d5b6159c83a2b836a23990f997b4a6d10b9 SHA1 83b70e0f2746131dc2b917d4eea2079d75375edb SHA256 c4943102f1b5ae03ad8a0cdd8effdef5a7ffa92199ba9149b5722eb39a7fa24f
-EBUILD libcaca-0.99_beta13.ebuild 1786 RMD160 65f99fb00dbbf4a7fd45e2303d5e1dccd2bf2810 SHA1 67cb8de9fd6586bf635a05cb5eb29e1d4736af2e SHA256 d69274941d7f37af9358a32a5e24e5531e46bbb9a436d44e3a0d9514fcad8efc
-MISC ChangeLog 8686 RMD160 57c297054b50a3fedc9438461c242e2032e75a10 SHA1 b493987e62ccfa3ac6fc347434e1ea7d99d8ccaa SHA256 b0310f8254b5067fb889ede1431ca2a50707150ab26a10aef29d28203de33e9f
+EBUILD libcaca-0.99_beta13.ebuild 1837 RMD160 acab862e26c8d3c0e3456fb645372f674ca53118 SHA1 126556d0b1330d021aa3bf2af749d39607271868 SHA256 fcbb69f500be518c55b7c8e9a5f6ff1711b61ef66941af9b7f2e41d9f6fb4bb8
+MISC ChangeLog 8944 RMD160 72c47b380e144dfdcfe7351e9861c296bbfc690a SHA1 078e59faa7c53abf3d8dcf0ec8a5441b701e2b34 SHA256 24e0b54ac4be4c56fcc22f992a959415d948b40893416ceba0690f3e749d81fd
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgn/OkACgkQvFcC4BYPU0qKiwCeN/q8S0qC89P164wwyfP75qRM
-4PwAmQEs4EMHVseWbo9LnOJGV2zRbGlo
-=UKZW
+iEYEARECAAYFAkgn/2EACgkQvFcC4BYPU0pHYACfUfdV6Q8GQ+k22939lXVHD3CM
+mZoAnRsrKw7EJQa3YwLKrJtN3L7LpFHj
+=QOK+
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libcaca/files/libcaca-0.99_beta13-ruby-Makefile.am.patch b/media-libs/libcaca/files/libcaca-0.99_beta13-ruby-Makefile.am.patch
new file mode 100644
index 000000000000..677fccf7fcdf
--- /dev/null
+++ b/media-libs/libcaca/files/libcaca-0.99_beta13-ruby-Makefile.am.patch
@@ -0,0 +1,11 @@
+--- ruby/Makefile.am
++++ ruby/Makefile.am
+@@ -24,7 +24,7 @@
+ cucul_la_LDFLAGS = -module -avoid-version -shared $(RUBY_LIBS)
+ cucul_la_LIBADD = ../cucul/libcucul.la
+ 
+-caca_la_CPPFLAGS = -I$(top_srcdir)/caca $(RUBY_CFLAGS)
++caca_la_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca $(RUBY_CFLAGS)
+ caca_la_SOURCES = caca.c \
+                   common.h \
+                   caca-display.c \
diff --git a/media-libs/libcaca/libcaca-0.99_beta13.ebuild b/media-libs/libcaca/libcaca-0.99_beta13.ebuild
index b18591ea82a9..10b01695c872 100644
--- a/media-libs/libcaca/libcaca-0.99_beta13.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta13.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/media-libs/libcaca/libcaca-0.99_beta13.ebuild,v 1.7 2008/05/12 08:16:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta13.ebuild,v 1.8 2008/05/12 08:27:04 aballier Exp $
 
 inherit eutils autotools libtool mono
 
@@ -36,6 +36,8 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${PN}-0.99_beta4-deoptimise.patch"
 	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
+	epatch "${FILESDIR}/${P}-ruby-Makefile.am.patch"
+
 
 	eautoreconf
 	elibtoolize