From 1f70e2164a65cc8e90087d8d7901c4068dd663cd Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Fri, 7 Jan 2005 22:30:36 +0000 Subject: [PATCH] Fixed destdir patch. --- media-libs/compface/ChangeLog | 6 +++++- media-libs/compface/Manifest | 20 ++++++++++++++----- media-libs/compface/compface-1.4.ebuild | 4 ++-- media-libs/compface/compface-1.5.ebuild | 6 +----- .../compface/files/compface-1.5-destdir.diff | 14 ++++++------- 5 files changed, 29 insertions(+), 21 deletions(-) diff --git a/media-libs/compface/ChangeLog b/media-libs/compface/ChangeLog index bae774722048..4cfdc845e09d 100644 --- a/media-libs/compface/ChangeLog +++ b/media-libs/compface/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/compface # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/ChangeLog,v 1.16 2005/01/06 16:18:24 hattya Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/ChangeLog,v 1.17 2005/01/07 22:30:36 eradicator Exp $ + + 07 Jan 2005; Jeremy Huddleston + files/compface-1.5-destdir.diff, compface-1.5.ebuild: + Fixed destdir patch. *compface-1.5 (07 Jan 2005) diff --git a/media-libs/compface/Manifest b/media-libs/compface/Manifest index cf54022b0cda..427217387f4c 100644 --- a/media-libs/compface/Manifest +++ b/media-libs/compface/Manifest @@ -1,9 +1,19 @@ -MD5 c3c09076e07a14a4b1816f1bd7619514 ChangeLog 2026 -MD5 742c6582a6c7564c49a0322de0832bb4 compface-1.4.ebuild 834 -MD5 522806fb5ab287724f92598089282093 compface-1.5.ebuild 828 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 70ad40e14aa115f8152cc88fbe6fc6b6 compface-1.4.ebuild 834 +MD5 5846b0a0442a495e2eee53aa10cdea0b ChangeLog 2167 +MD5 861aa412b6d6ce7ffc5c5300e5588332 compface-1.5.ebuild 828 MD5 eec73fbea3403356a034bd509fe1a022 metadata.xml 436 -MD5 92cd926808b9b818d1a0228938edd8e4 files/compface-1.4-destdir.diff 1759 MD5 99136b248ff383abec90471de2c701ac files/compface-1.4-errno.diff 908 -MD5 a08ef9d3bed4c1672cdb05afa215160d files/compface-1.5-destdir.diff 1793 MD5 9b8d9c4812b5caa0557fe8bc88a688d8 files/digest-compface-1.4 63 +MD5 92cd926808b9b818d1a0228938edd8e4 files/compface-1.4-destdir.diff 1759 +MD5 0915874039bca1668b62635761a30440 files/compface-1.5-destdir.diff 1658 MD5 278f048a005cd301b3ce122438229c6c files/digest-compface-1.5 63 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.0 (GNU/Linux) + +iD4DBQFB3w2gArHZZzCEUG0RAoAKAJ42eqi8dihT2wayoTchXuTlxjsT4QCWOGLK +YyHJQivovJfLCXR1z7iggw== +=1dRX +-----END PGP SIGNATURE----- diff --git a/media-libs/compface/compface-1.4.ebuild b/media-libs/compface/compface-1.4.ebuild index ba7df2f98483..7f60564efbc7 100644 --- a/media-libs/compface/compface-1.4.ebuild +++ b/media-libs/compface/compface-1.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/compface-1.4.ebuild,v 1.22 2004/10/05 09:39:09 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/compface-1.4.ebuild,v 1.23 2005/01/07 22:30:36 eradicator Exp $ IUSE="" diff --git a/media-libs/compface/compface-1.5.ebuild b/media-libs/compface/compface-1.5.ebuild index cfe64a242cbb..fac321f49c40 100644 --- a/media-libs/compface/compface-1.5.ebuild +++ b/media-libs/compface/compface-1.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/compface-1.5.ebuild,v 1.3 2005/01/06 16:21:01 hattya Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/compface-1.5.ebuild,v 1.4 2005/01/07 22:30:36 eradicator Exp $ IUSE="" @@ -17,21 +17,17 @@ SLOT="0" DEPEND="virtual/libc" src_unpack() { - unpack ${A} cd ${S} epatch ${FILESDIR}/${P}-destdir.diff WANT_AUTOCONF=2.5 autoconf - } src_install() { - dodir /usr/share/man/man{1,3} /usr/{bin,include,$(get_libdir)} make DESTDIR="${D}" install || die newbin xbm2xface{.pl,} dodoc README ChangeLog - } diff --git a/media-libs/compface/files/compface-1.5-destdir.diff b/media-libs/compface/files/compface-1.5-destdir.diff index b2827dcf410a..cd148c1c0200 100644 --- a/media-libs/compface/files/compface-1.5-destdir.diff +++ b/media-libs/compface/files/compface-1.5-destdir.diff @@ -1,7 +1,7 @@ -diff -Naur compface-1.4.orig/Makefile.in compface-1.4/Makefile.in ---- compface-1.4.orig/Makefile.in 2000-11-22 05:38:39.000000000 -0800 -+++ compface-1.4/Makefile.in 2004-10-05 02:34:53.307138856 -0700 -@@ -71,18 +71,18 @@ +diff -Naurp compface-1.5.orig/Makefile.in compface-1.5/Makefile.in +--- compface-1.5.orig/Makefile.in 2004-12-23 22:23:08.000000000 -0800 ++++ compface-1.5/Makefile.in 2005-01-07 14:29:46.298182241 -0800 +@@ -71,18 +71,16 @@ dist: $(DISTFILES) $(RM) -rf `cat .fname` .fname install: $(NAME) $(UNNAME) $(LIBNAME) @@ -19,14 +19,12 @@ diff -Naur compface-1.4.orig/Makefile.in compface-1.4/Makefile.in - $(INSTALL_DATA) $(srcdir)/$(LIBNAME) $(LIBRARY) + $(INSTALL_PROGRAM) $(srcdir)/$(NAME) $(DESTDIR)$(EXECUTABLE) + -chmod 0755 $(DESTDIR)$(EXECUTABLE) -+ -strip $(DESTDIR)$(EXECUTABLE) + $(INSTALL_PROGRAM) $(srcdir)/$(UNNAME) $(DESTDIR)$(UNEXECUTABLE) + -chmod 0755 $(DESTDIR)$(UNEXECUTABLE) -+ -strip $(DESTDIR)$(UNEXECUTABLE) + $(INSTALL_DATA) $(srcdir)/$(NAME).1 $(DESTDIR)$(MAN1DIR)/$(NAME).1 -+ cd $(DESTDIR)$(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1 $(UNNAME).1 ++ $(LN_S) $(NAME).1 $(DESTDIR)$(UNNAME).1 + $(INSTALL_DATA) $(srcdir)/$(NAME).3 $(DESTDIR)$(MAN3DIR)/$(NAME).3 -+ cd $(DESTDIR)$(MAN3DIR) && $(RM) ./$(UNNAME).3 && $(LN_S) $(NAME).3 $(UNNAME).3 ++ $(LN_S) $(NAME).3 $(DESTDIR)$(UNNAME).3 + for hdr in $(INSTALLHEADERS); do $(INSTALL_DATA) $(srcdir)/$${hdr} $(DESTDIR)$(INCLUDEDIR)/$${hdr}; done + $(INSTALL_DATA) $(srcdir)/$(LIBNAME) $(DESTDIR)$(LIBRARY) -- 2.26.2