undid premature removal so ppc-stable lirc RDEPEND can still be satisfied

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64
RepoMan-Options: --force

7 files changed, 200 insertions, 9 deletions

diff --git a/media-libs/libirman/ChangeLog b/media-libs/libirman/ChangeLog
index c41ffee67ee8..a0d6bc474c9b 100644
--- a/media-libs/libirman/ChangeLog
+++ b/media-libs/libirman/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-libs/libirman
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libirman/ChangeLog,v 1.32 2012/08/29 14:26:33 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libirman/ChangeLog,v 1.33 2012/09/14 17:33:12 axs Exp $
+
+  14 Sep 2012; Ian Stakenvicius <axs@gentoo.org> +libirman-0.4.2-r1.ebuild,
+  +files/libirman-0.4.2-PICShared.patch, +files/libirman-0.4.2-destdir.patch,
+  +files/libirman-0.4.2-format.patch, +files/libirman-0.4.2-gcc4.patch:
+  undid premature removal so ppc-stable lirc RDEPEND can still be satisfied
+
+  14 Sep 2012; Ian Stakenvicius <axs@gentoo.org> +libirman-0.4.2-r1.ebuild,
+  +files/libirman-0.4.2-PICShared.patch, +files/libirman-0.4.2-destdir.patch,
+  +files/libirman-0.4.2-format.patch, +files/libirman-0.4.2-gcc4.patch:
+  undid premature removal so ppc-stable lirc RDEPEND can still be satisfied
 
   29 Aug 2012; Michael Palimaka <kensington@gentoo.org>
   -files/libirman-0.4.2-PICShared.patch, -files/libirman-0.4.2-destdir.patch,
diff --git a/media-libs/libirman/Manifest b/media-libs/libirman/Manifest
index 2561869ead67..2f9f888de5b7 100644
--- a/media-libs/libirman/Manifest
+++ b/media-libs/libirman/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libirman-0.4.2-PICShared.patch 2217 SHA256 e24eba3c68e14e677e01e29c15d82d00084e95daa9fa98f7f3bcac880d6f6f1a SHA512 1c34a14964b38fe0754be2aaef6fa3b5c33a148e42251fe82e32f1ca9e268684b7289ee2b0c0cd32b91025ff5afeed7ca25b4a01af107e2dd4e117190709882c WHIRLPOOL 38b159659efa8c6a69a0ca1fa8e692ba5d93c9b216d582eea8d8561e2e8efd8cd8e98b52540d3f81d67d9e6d4bc6cc3f037068b87e86284b745655600c8c4ee8
+AUX libirman-0.4.2-destdir.patch 1726 SHA256 79bcfe9e6548dffb9015fa26cfff44994a68a9ee550966fa2774c9fd9fc9aecc SHA512 80653619e64489e9fead7905a4a7a0fdd19ce26dde17e921204dd4b0d7a00a80edb7bf2448e2914b27b9c8e4866fd0b09098853906cb76a57e3b657adbe2e832 WHIRLPOOL 5e97351037b175f5d9097b9a273c68a5ef2c5df87c9a1391b599aae73973f3203e023f487197b0958c03bb5b2d4825684a21ddfec5dc7fb806df18af6f30174f
+AUX libirman-0.4.2-format.patch 466 SHA256 f767ec7ddfbcb663ee8cbc6809a7832ade47efcb67b81cfbcd1a9b51679f9e9a SHA512 49c3a5ae6eec404ca733cf412b64b4ba195c414856bce9fa1d44d89a250c716a7afdef61c0cd7141e65025f9b07b43609eff3cf2a21760226861258330c7fe2f WHIRLPOOL bc99b6e41a48da848d9ebbd5b107f1241d7077d078046c75c081767ea6bcf99be45eb6109ebbf7d8c2e71ca1ec96f6b5be46e7ebae8a9440853e476bf34a201b
+AUX libirman-0.4.2-gcc4.patch 359 SHA256 622c9c5c21daa80193e1e71a1841235eb9485a1f2da3edd6ac1be5f3c5bac015 SHA512 2cf70bac3f4e6015f2348056257d27960cc34cf975b40cd739b8c19d7fccc28ff41cd72679affec8c84b374c48d2a81312e61adf936cc2141fa3d1ca1d1a1d64 WHIRLPOOL 8f95d068077929e55ae449e857015ad79c0c1bb77795d39cea3b52ba4dc251ee070da794d91142ec3297290ca43c90958c7132cb8bb9b25c5e3cc3b799742323
+DIST libirman-0.4.2.tar.gz 52665 SHA256 43b12f243c6978ffa85dc4a606335b1e46b5df870e61e3381387edae4f20beb8 SHA512 4bca358dae5b3a02dd2f654eb2534565ef4b66d0f728c7248ba21c14d5a0b06cb85c2cd2d162460ca0bbac381527abb69a29d4178bb0ee3b21429dd74d085d9c WHIRLPOOL d42b046b503c7dd97ecf8890e90e96d92463268a87486972c0d0947773f4ab889a0383822a51aa2336c92244416c5cb2319b86debb826815aed8915d30a0a014
 DIST libirman-0.4.5.tar.bz2 225330 SHA256 e0220645fedb511277720c03feb5fbf51ec2cef08f8e859c0ff4ecff4286064e SHA512 5b0a8e1c0699bf1d8b43bbb2320b3abbd1f8d400264efd78d1cfb5ea942ff1d272b150012dfa61f5afc427824282a62755ec1e1189dd3d849a5f62293125ffb3 WHIRLPOOL 6cf209e416bc162acc5142ab2ce3f390700cdc05cc8a521206a9293322d46d481c8b59bd5bcfa1a1c9d590a79d9e485e2dfd3246b4ff6a6fe7a59288ef37880d
+EBUILD libirman-0.4.2-r1.ebuild 1008 SHA256 45979bfad6f47443e1a71f250917752c7951aded81bd0dd057aca05674161617 SHA512 61ee667a53be00fc24c261a715ceb596a6db84a59de21c39200e8c99b14c92ec6f4c3694ff1198ae7ae68843bf350ec379436c5b692c8c0de10675973c6d4ef3 WHIRLPOOL ab0d9ec5fb06a3e1ea61fb382c73dd74706b273c19c5e8653f6e0af6e0cffdd64cdc821432f043e34d359c7c6e7df651fbdd206571cd481b3e19feff8fbdba7c
 EBUILD libirman-0.4.5.ebuild 807 SHA256 8e3cb40f8e834817d3faf3743dd3ce8cf3a5941dcc4c495b2954d0779ea386be SHA512 747404bbf5cfe34881b09e1afd44d0de7e1fef7bb131701015478d9ef0f9e871e8967d2d8fb4ee5fcc9b02daa28b42e2a941c1159e322546500c209bd5f78237 WHIRLPOOL 0f3692b5a82d7cac5700b0c5a257d60c1d6514a2c10ce5a1110ab9e4eb513e2d9b07cb908943b078d3d05419fc9d613f21a092054ae994a6a389b3ec48d48d21
-MISC ChangeLog 4323 SHA256 54134def84ebd05786fb9e8fdaee58a0c5b392346bd21b9881338418063787de SHA512 8c28e87285afd73aea8b8f14c901ce0144af2263741c0d01a70f16206bf39d9628464fa7b3c2ff68676e4a76fab5f08e1212439b8baff0a1928d8b29cc968688 WHIRLPOOL 6dce7d2d5e3fb84facfae9abf160de37d778e0d0e1f40085570c0048197c1066d7cbf6afd5fe413cb845fecdcd74ed445326592759dddd482a48040cf5e80b60
+MISC ChangeLog 4922 SHA256 94a41b8bf2aaad76704ff53ca15afc95056918225f2b4f1739171dffb2543c10 SHA512 6f96682e3e05fcedfad70c31fbd78f180a034c208c6341f43bdf8278706f3b750881014b8aabf81a12c2274a6042dfc98e1396260b6e455336fe3bf3a5ad2249 WHIRLPOOL 08f61d83452c3f3b9b7f65a30216ecea863687f944f914004525bbf9486d87dbc8b9caec79038b12256b89e1a10c2eab7146405d84c8e4abb835ad5f4221fb58
 MISC metadata.xml 232 SHA256 ef27bafba213aa23776015e20dbb2ddc9c5a2f61226c9a8f6bc3770bf9433283 SHA512 9c1e8a5addd558bcf6913ceecbf88aeb6fd7780ef88029f3a7c94a61485861c97c10da593082a771ab114b2ac20f8f15332dce32e7d1512fe5109c00e0a50fb2 WHIRLPOOL dfda37bdd3b98bb53cc39d2ac170f775ac5e76b7b0f3f8593825a861f490f171ef9ced055f18630b65bac1b75551057746be262090ac78ad380b75c0be830a83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQPiZ1AAoJEMbwO6tnXQ0sCoUH/iouMAJXd2iGbOS3hJg10OLd
-CO0rimi9PtNPdHOtZS/LjT1t3udRxBeV1k/6IZ1v3odmjtxDS3u4ojibrsw2702H
-AkdXQ4pKMQi6UuKpuLddhqKZvYeHKdMw+8ZEW8KIctmeTC5YYz/DJobQ41WmCspb
-pkd9tXcMkMofKLLp8XKZyF/TEvT79J1509//E7Fp/VVa4MwQzrcPQXcF/tNxQIjE
-3RyA7s9pgt2t8y2827vPGEOL5Ttrm9C7CoqB2DldGjFXigjuX3r4WVwBWUACgiWF
-lluTP/FtBq46HAQ79J93rb9A5+jHw3S/8cZ0Fg40wE2g8LYJihM9neY17U9lOEo=
-=34cZ
+iF4EAREIAAYFAlBTamUACgkQ2ugaI38ACPCQGAD/cdXruoEc2TvtFEc1RyZpFouT
+HUbtVBvnQ5Rv4wWQE/UA/1pLgnp4wzC2uHzPM0Keq+n7terF9w4nnqGReDsrEynJ
+=TC2W
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libirman/files/libirman-0.4.2-PICShared.patch b/media-libs/libirman/files/libirman-0.4.2-PICShared.patch
new file mode 100644
index 000000000000..1b8025581a6c
--- /dev/null
+++ b/media-libs/libirman/files/libirman-0.4.2-PICShared.patch
@@ -0,0 +1,73 @@
+diff -Naur libirman-0.4.2.orig/Makefile.in libirman-0.4.2/Makefile.in
+--- libirman-0.4.2.orig/Makefile.in	1999-03-28 15:42:41.000000000 -0800
++++ libirman-0.4.2/Makefile.in	2004-07-04 23:39:43.101677411 -0700
+@@ -16,7 +16,7 @@
+ CC = @CC@
+ TAR = tar
+ 
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -fPIC -DPIC
+ CPPFLAGS = -I. @CPPFLAGS@ @DEFS@
+ LDFLAGS = @LDFLAGS@ -L. -lirman
+ LDFLAGS_SW = @LDFLAGS@ -L. -lirman_sw
+@@ -58,9 +58,9 @@
+ both: standard swtest
+ 
+ 
+-libirman: libirman.a
++libirman: libirman.a libirman.so
+ 
+-libirman_sw: libirman_sw.a
++libirman_sw: libirman_sw.a libirman_sw.so
+ 
+ 
+ test_io: libirman.a $(IO_OBJS)
+@@ -85,10 +85,16 @@
+ 	$(AR) $(ARFLAGS) libirman.a $(IROBJS)
+ 	$(RANLIB) libirman.a
+ 
++libirman.so: $(IROBJS)
++	$(CC) -shared -Wl,-shared,-soname,libirman.so -o libirman.so $(IROBJS)
++
+ libirman_sw.a: $(IROBJS_SW)
+ 	$(AR) $(ARFLAGS) libirman_sw.a $(IROBJS_SW)
+ 	$(RANLIB) libirman_sw.a
+ 
++libirman_sw.so: $(IROBJS_SW)
++	$(CC) -shared -Wl,-shared,-soname,libirman_sw.so -o libirman_sw.so $(IROBJS_SW)
++
+ %.o: %.c irman.h config.h
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+ 
+@@ -96,7 +102,7 @@
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+ 
+ ircmd.o: ircmd.c irman.h config.h
+-	$(CC) $(CPPFLAGS) -DIR_SYSCONF_DIR=\"$(sysconfdir)\" -c $(srcdir)/ircmd.c -o ircmd.o
++	$(CC) $(CFLAGS) $(CPPFLAGS) -DIR_SYSCONF_DIR=\"$(sysconfdir)\" -c $(srcdir)/ircmd.c -o ircmd.o
+ irfunc_sw.o: irfunc.c irman.h
+ 	$(CC) $(CPPFLAGS) -DIR_SOFTWARE_TEST $(CFLAGS) -c $(srcdir)/irfunc.c -o irfunc_sw.o
+ 
+@@ -114,18 +120,22 @@
+ install-normal:
+ 	$(INSTALL) -m 755 workmanir $(bindir)/workmanir
+ 	$(INSTALL) -m 755 libirman.a $(libdir)/libirman.a
++	$(INSTALL) -m 755 libirman.so $(libdir)/libirman.so
+ 	$(INSTALL) -m 644 irman.conf $(sysconfdir)/irman.conf
+ 	$(INSTALL) -m 644 irman.h $(includedir)/irman.h
+ 
+ install-swtest:
+ 	$(INSTALL) -m 755 workmanir $(bindir)/workmanir
+ 	$(INSTALL) -m 755 libirman_sw.a $(libdir)/libirman_sw.a
++	$(INSTALL) -m 755 libirman_sw.so $(libdir)/libirman_sw.so
+ 
+ uninstall:
+ 	$(RM) $(bindir)/workmanir
+ 	$(RM) $(bindir)/workmanir_sw
+ 	$(RM) $(libdir)/libirman.a
++	$(RM) $(libdir)/libirman.so
+ 	$(RM) $(libdir)/libirman_sw.a
++	$(RM) $(libdir)/libirman_sw.so
+ 	$(RM) $(sysconfdir)/irman.conf
+ 
+ dist:
diff --git a/media-libs/libirman/files/libirman-0.4.2-destdir.patch b/media-libs/libirman/files/libirman-0.4.2-destdir.patch
new file mode 100644
index 000000000000..cb4d94b4d1a6
--- /dev/null
+++ b/media-libs/libirman/files/libirman-0.4.2-destdir.patch
@@ -0,0 +1,38 @@
+diff -Naur libirman-0.4.2.orig/Makefile.in libirman-0.4.2/Makefile.in
+--- libirman-0.4.2.orig/Makefile.in	2004-09-24 02:58:09.312603000 -0700
++++ libirman-0.4.2/Makefile.in	2004-09-24 02:59:22.620612916 -0700
+@@ -112,22 +112,22 @@
+ 	@echo notice: the test programs are only installed in the current directory \(`pwd`\)
+ 
+ install-dirs:
+-	$(top_srcdir)/mkinstalldirs $(libdir)
+-	$(top_srcdir)/mkinstalldirs $(bindir)
+-	$(top_srcdir)/mkinstalldirs $(sbindir)
+-	$(top_srcdir)/mkinstalldirs $(sysconfdir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
+ 
+ install-normal:
+-	$(INSTALL) -m 755 workmanir $(bindir)/workmanir
+-	$(INSTALL) -m 755 libirman.a $(libdir)/libirman.a
+-	$(INSTALL) -m 755 libirman.so $(libdir)/libirman.so
+-	$(INSTALL) -m 644 irman.conf $(sysconfdir)/irman.conf
+-	$(INSTALL) -m 644 irman.h $(includedir)/irman.h
++	$(INSTALL) -m 755 workmanir $(DESTDIR)$(bindir)/workmanir
++	$(INSTALL) -m 755 libirman.a $(DESTDIR)$(libdir)/libirman.a
++	$(INSTALL) -m 755 libirman.so $(DESTDIR)$(libdir)/libirman.so
++	$(INSTALL) -m 644 irman.conf $(DESTDIR)$(sysconfdir)/irman.conf
++	$(INSTALL) -m 644 irman.h $(DESTDIR)$(includedir)/irman.h
+ 
+ install-swtest:
+-	$(INSTALL) -m 755 workmanir $(bindir)/workmanir
+-	$(INSTALL) -m 755 libirman_sw.a $(libdir)/libirman_sw.a
+-	$(INSTALL) -m 755 libirman_sw.so $(libdir)/libirman_sw.so
++	$(INSTALL) -m 755 workmanir $(DESTDIR)$(bindir)/workmanir
++	$(INSTALL) -m 755 libirman_sw.a $(DESTDIR)$(libdir)/libirman_sw.a
++	$(INSTALL) -m 755 libirman_sw.so $(DESTDIR)$(libdir)/libirman_sw.so
+ 
+ uninstall:
+ 	$(RM) $(bindir)/workmanir
diff --git a/media-libs/libirman/files/libirman-0.4.2-format.patch b/media-libs/libirman/files/libirman-0.4.2-format.patch
new file mode 100644
index 000000000000..ee1c4f5cfe74
--- /dev/null
+++ b/media-libs/libirman/files/libirman-0.4.2-format.patch
@@ -0,0 +1,13 @@
+Index: libirman-0.4.2/workmanir.c
+===================================================================
+--- libirman-0.4.2.orig/workmanir.c
++++ libirman-0.4.2/workmanir.c
+@@ -148,7 +148,7 @@ int main(int argc, char **argv)
+ 
+   errno = 0;  
+   if (ir_init(filename) < 0) {
+-    fprintf(stderr, "%s: error initialising Irman: `%s'\n", ir_strerror(errno));
++    fprintf(stderr, "%s: error initialising Irman: `%s'\n", progname, ir_strerror(errno));
+     exit(1);
+   }
+ 
diff --git a/media-libs/libirman/files/libirman-0.4.2-gcc4.patch b/media-libs/libirman/files/libirman-0.4.2-gcc4.patch
new file mode 100644
index 000000000000..4c21df4a7a2a
--- /dev/null
+++ b/media-libs/libirman/files/libirman-0.4.2-gcc4.patch
@@ -0,0 +1,13 @@
+Index: libirman-0.4.2/chunk.c
+===================================================================
+--- libirman-0.4.2.orig/chunk.c
++++ libirman-0.4.2/chunk.c
+@@ -122,7 +122,7 @@ void *ch_malloc(size_t numbytes, chunk_t
+   
+   ptr = ch->top;
+   ch->free -= numbytes;
+-  (char *)ch->top += numbytes;
++  ch->top = (char*)(ch->top) + numbytes;
+ 
+   return ptr;
+ }
diff --git a/media-libs/libirman/libirman-0.4.2-r1.ebuild b/media-libs/libirman/libirman-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..31efae0b743d
--- /dev/null
+++ b/media-libs/libirman/libirman-0.4.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libirman/libirman-0.4.2-r1.ebuild,v 1.15 2012/09/14 17:33:11 axs Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="library for Irman control of Unix software"
+SRC_URI="http://www.lirc.org/software/snapshots/${P}.tar.gz"
+HOMEPAGE="http://www.evation.com/libirman/libirman.html"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-PICShared.patch"
+	epatch "${FILESDIR}/${P}-destdir.patch"
+	epatch "${FILESDIR}/${P}-format.patch"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
+}
+
+src_compile() {
+	tc-export CC LD AR RANLIB
+
+	econf || die "econf failed"
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	dodir /usr/include
+
+	make DESTDIR="${D}" \
+		LIRC_DRIVER_DEVICE="${D}/dev/lirc" \
+		install || die
+
+	dobin test_func test_io test_name
+	dodoc NEWS README* TECHNICAL TODO
+}