diff options
| -rw-r--r-- | media-libs/libirman/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libirman/Manifest | 5 | ||||
| -rw-r--r-- | media-libs/libirman/files/libirman-0.4.2-destdir.patch | 38 | ||||
| -rw-r--r-- | media-libs/libirman/libirman-0.4.2-r1.ebuild | 11 |
4 files changed, 51 insertions, 9 deletions
diff --git a/media-libs/libirman/ChangeLog b/media-libs/libirman/ChangeLog index b9336166e113..9660b1dada62 100644 --- a/media-libs/libirman/ChangeLog +++ b/media-libs/libirman/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libirman # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libirman/ChangeLog,v 1.11 2004/09/01 17:11:20 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libirman/ChangeLog,v 1.12 2004/09/24 10:02:51 eradicator Exp $ + + 24 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> + +files/libirman-0.4.2-destdir.patch: + Fixed installation on amd64 with multilib. 01 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> libirman-0.4.2-r1.ebuild: diff --git a/media-libs/libirman/Manifest b/media-libs/libirman/Manifest index 3ffbb6b70c8a..429162e3a87e 100644 --- a/media-libs/libirman/Manifest +++ b/media-libs/libirman/Manifest @@ -1,7 +1,8 @@ MD5 e1130571bb48518bda6de7441a063dff metadata.xml 159 MD5 a0fc58b42f1df87c3dc1fdaa8983f754 libirman-0.4.2.ebuild 727 -MD5 36b4616c551a185439b0e518c9160a41 ChangeLog 1486 -MD5 64aab731d6830b875a0dbdcfa46b16cf libirman-0.4.2-r1.ebuild 838 +MD5 8956c5e65de1f48444e90911cd1c4fa5 ChangeLog 1628 +MD5 385bee801412082776104a88d8a1fe0a libirman-0.4.2-r1.ebuild 858 MD5 3cd23162cf3639176a9e24d4b1fd6b80 files/digest-libirman-0.4.2 65 MD5 831a488284f41ff536f9f16429321fd0 files/libirman-0.4.2-PICShared.patch 2217 MD5 3cd23162cf3639176a9e24d4b1fd6b80 files/digest-libirman-0.4.2-r1 65 +MD5 50d07f277bdd8d7ff6e2a74cddc0eadd files/libirman-0.4.2-destdir.patch 1726 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/libirman-0.4.2-r1.ebuild b/media-libs/libirman/libirman-0.4.2-r1.ebuild index 5ecd47ca19a7..5b76dba996f3 100644 --- a/media-libs/libirman/libirman-0.4.2-r1.ebuild +++ b/media-libs/libirman/libirman-0.4.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 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.3 2004/09/01 17:11:20 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libirman/libirman-0.4.2-r1.ebuild,v 1.4 2004/09/24 10:02:51 eradicator Exp $ IUSE="" inherit eutils @@ -20,16 +20,15 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/${P}-PICShared.patch + epatch ${FILESDIR}/${P}-destdir.patch } src_install() { dodir /usr/include - make \ - prefix=${D}/usr \ - sysconfdir=${D}/etc \ - LIRC_DRIVER_DEVICE=${D}/dev/lirc \ - install || die + make DESTDIR="${D}" \ + LIRC_DRIVER_DEVICE="${D}/dev/lirc" \ + install || die dobin test_func test_io test_name dodoc COPYING* NEWS README* TECHNICAL TODO |