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

(Portage version: 2.1.11.9/cvs/Linux x86_64, RepoMan options: --force)

6 files changed, 190 insertions, 1 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/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
+}