7 files changed, 42 insertions, 136 deletions

diff --git a/media-libs/compface/ChangeLog b/media-libs/compface/ChangeLog
index b2382e406f7e..55044cf66d66 100644
--- a/media-libs/compface/ChangeLog
+++ b/media-libs/compface/ChangeLog
@@ -1,92 +1,9 @@
 # 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.28 2005/11/13 10:43:10 hattya Exp $
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/ChangeLog,v 1.1 2002/02/01 21:53:30 gbevin Exp $
 
-*compface-1.5.2 (13 Nov 2005)
-
-  13 Nov 2005; Akinori Hattori <hattya@gentoo.org>
-  +files/compface-1.5.2-destdir.diff, +compface-1.5.2.ebuild:
-  new upstream release. fixes bug #111005.
-
-  19 Sep 2005; Seemant Kulleen <seemant@gentoo.org> compface-1.5.1.ebuild:
-  crlf fix thanks to James Rowe in bug #106246
-
-  19 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> compface-1.5.1.ebuild:
-  Stable on alpha.
-
-  06 Jun 2005; Markus Rothe <corsair@gentoo.org> compface-1.5.1.ebuild:
-  Stable on ppc64
-
-  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> compface-1.5.1.ebuild:
-  Stable on ppc.
-
-  22 May 2005; Rene Nussbaumer <killerfox@gentoo.org> compface-1.5.1.ebuild:
-  Stable on hppa
-
-  15 May 2005; Jason Wever <weeve@gentoo.org> compface-1.5.1.ebuild:
-  Stable on SPARC.
-
-  08 May 2005; Aron Griffis <agriffis@gentoo.org> compface-1.5.1.ebuild:
-  stable on ia64
-
-  28 Apr 2005; Akinori Hattori <hattya@gentoo.org> compface-1.5.1.ebuild:
-  stable on x86.
-
-  30 Jan 2005; <gongloo@gentoo.org> compface-1.4.ebuild:
-  Stable on ppc-macos.
-
-*compface-1.5.1 (26 Jan 2005)
-
-  26 Jan 2005; Akinori Hattori <hattya@gentoo.org>
-  +files/compface-1.5.1-destdir.diff, +compface-1.5.1.ebuild:
-  new upstream release. fixes bug #79035.
-
-  07 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  files/compface-1.5-destdir.diff, compface-1.5.ebuild:
-  Fixed destdir patch.
-
-*compface-1.5 (07 Jan 2005)
-
-  07 Jan 2005; Akinori Hattori <hattya@gentoo.org> +compface-1.5.ebuild,
-  +files/compface-1.5-destdir.diff:
-  new upstream release. fixes bug #76063.
-
-  05 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  +files/compface-1.4-destdir.diff:
-  Made a DESTDIR patch and use that to fix installation on multilib systems.
-
-  01 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> compface-1.4.ebuild:
-  Added to ~ppc-macos; bug #65610.
-
-  20 Jul 2004; Tom Gall <tgall@gentoo.org> compface-1.4.ebuild:
-  stable on ppc64, bug #57174
-
-  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> compface-1.4.ebuild:
-  virtual/glibc -> virtual/libc
-
-  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> compface-1.4.ebuild:
-  stable on ia64
-
-  14 Nov 2003; Brad House <brad_mssw@gentoo.org> compface-1.4.ebuild:
-  mark stable on amd64
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *compface-1.4 (1 Feb 2002)
 
-  06 Jul 2003; Guy martin <gmsoft@gentoo.org> compface-1.4.ebuild :
-  Added hppa to KEYWORDS.
-
-  05 Mar 2003; Aron Griffis <agriffis@gentoo.org> compface-1.4.ebuild:
-  Mark stable on alpha
-
-  27 Feb 2003; Seemant Kulleen <seemant@gentoo.org> compface-1.4.ebuild,
-  files/compface-1.4-errno.diff:
-  added fix for errno brokenness caused by newest glibc
-
-  07 Aug 2002; Mark Guertin <gerk@gentoo.org> :
-  Added ppc to keywords
-
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/media-libs/compface/Manifest b/media-libs/compface/Manifest
index 73eca04d5b6e..e69de29bb2d1 100644
--- a/media-libs/compface/Manifest
+++ b/media-libs/compface/Manifest
@@ -1,15 +0,0 @@
-MD5 187c0621d5607a76179ab18a45990799 ChangeLog 3391
-MD5 43a44e5f4cf8c9078b730460bab5a9e9 compface-1.4.ebuild 830
-MD5 24649ed410148a4743dfd408eb85608b compface-1.5.1.ebuild 869
-MD5 62b4e54f77d148fd2389b250bf54b407 compface-1.5.2.ebuild 736
-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 bc74c4ff7219b259c15153a1ce23ef76 files/compface-1.5-destdir.diff 1680
-MD5 bfbda4c57251fde19873b043d920fef7 files/compface-1.5.1-destdir.diff 1648
-MD5 54146587d73a019766650482fd262795 files/compface-1.5.2-destdir.diff 549
-MD5 9b8d9c4812b5caa0557fe8bc88a688d8 files/digest-compface-1.4 63
-MD5 278f048a005cd301b3ce122438229c6c files/digest-compface-1.5 63
-MD5 f7f2d3f516dc4843604ade194eb8ccf5 files/digest-compface-1.5.1 65
-MD5 d747f3964b74ce18b1e779c46eb098ef files/digest-compface-1.5.2 65
diff --git a/media-libs/compface/compface-1.4.ebuild b/media-libs/compface/compface-1.4.ebuild
index 25ae570c191f..bf356ab9165e 100644
--- a/media-libs/compface/compface-1.4.ebuild
+++ b/media-libs/compface/compface-1.4.ebuild
@@ -1,31 +1,26 @@
-# 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.24 2005/01/31 04:29:53 gongloo Exp $
-
-IUSE=""
-
-inherit eutils
-
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Michael C Tisltra <tadpol@tadpol.org>
+# $header
+
+#P=
+A=${P}.tar.gz
+S=${WORKDIR}/${P}
 DESCRIPTION="Utilities and library to convert to/from X-Face format"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/apps/graphics/convert/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/apps/graphics/convert/${P}.tar.gz"
+SRC_URI="http://www.ibiblio.org/pub/Linux/apps/graphics/convert/${A}"
+HOMEPAGE=""
 
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 ppc64 ppc-macos"
+DEPEND=">=sys-libs/glibc-2.2.1"
 
-DEPEND="virtual/libc"
+src_compile() {
+    try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST}
+    try make
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-errno.diff
-	epatch ${FILESDIR}/${P}-destdir.diff
 }
 
-src_install() {
-	dodir /usr/share/man/man{1,3} /usr/{bin,include,$(get_libdir)}
-	make DESTDIR="${D}" install || die
-
-	dodoc README ChangeLog
+src_install () {
+    dodir /usr/share/man/man3
+    try make DESTDIR=${D} install
+    dodoc README ChangeLog
 }
+
diff --git a/media-libs/compface/compface-1.5.1.ebuild b/media-libs/compface/compface-1.5.1.ebuild
index 8ee72010b274..e61cf623fd3e 100644
--- a/media-libs/compface/compface-1.5.1.ebuild
+++ b/media-libs/compface/compface-1.5.1.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.1.ebuild,v 1.9 2005/09/19 12:18:10 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/compface-1.5.1.ebuild,v 1.1 2005/01/26 12:32:20 hattya Exp $
 
 IUSE=""
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.xemacs.org/Download/optLibs.html"
 SRC_URI="http://ftp.xemacs.org/pub/xemacs/aux/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="alpha ~amd64 hppa ia64 ppc ~ppc-macos ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
 SLOT="0"
 
 DEPEND="virtual/libc"
@@ -21,7 +21,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	sed -i -e "s:\r::" Makefile.in xbm2xface.pl
+	sed -i -e "s:\r::" Makefile.in
 	epatch ${FILESDIR}/${P}-destdir.diff
 	WANT_AUTOCONF=2.5 autoconf
 
diff --git a/media-libs/compface/compface-1.5.ebuild b/media-libs/compface/compface-1.5.ebuild
index fac321f49c40..2565c3a2e6af 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.4 2005/01/07 22:30:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/compface-1.5.ebuild,v 1.1 2005/01/06 16:15:38 hattya Exp $
 
 IUSE=""
 
@@ -10,24 +10,31 @@ DESCRIPTION="Utilities and library to convert to/from X-Face format"
 HOMEPAGE="http://www.xemacs.org/Download/optLibs.html"
 SRC_URI="http://ftp.xemacs.org/pub/xemacs/aux/${P}.tar.gz"
 
+RESTRICT="nomirror"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~ppc64 ~ppc-macos"
 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
+
 }
+
+# $Id: compface-1.5.ebuild,v 1.1 2005/01/06 16:15:38 hattya Exp $
diff --git a/media-libs/compface/files/compface-1.5-destdir.diff b/media-libs/compface/files/compface-1.5-destdir.diff
index 1971608c2881..b2827dcf410a 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 -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:38:51.051710220 -0800
-@@ -71,18 +71,16 @@ dist: $(DISTFILES)

+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 @@

  		$(RM) -rf `cat .fname` .fname

  

  install: 	$(NAME) $(UNNAME) $(LIBNAME)

@@ -19,12 +19,14 @@ diff -Naurp compface-1.5.orig/Makefile.in compface-1.5/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

-+		$(LN_S) $(NAME).1 $(DESTDIR)$(MAN1DIR)/$(UNNAME).1

++		cd $(DESTDIR)$(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1 $(UNNAME).1

 +		$(INSTALL_DATA) $(srcdir)/$(NAME).3 $(DESTDIR)$(MAN3DIR)/$(NAME).3

-+		$(LN_S) $(NAME).3 $(DESTDIR)$(MAN3DIR)/$(UNNAME).3

++		cd $(DESTDIR)$(MAN3DIR) && $(RM) ./$(UNNAME).3 && $(LN_S) $(NAME).3 $(UNNAME).3

 +		for hdr in $(INSTALLHEADERS); do $(INSTALL_DATA) $(srcdir)/$${hdr} $(DESTDIR)$(INCLUDEDIR)/$${hdr}; done

 +		$(INSTALL_DATA) $(srcdir)/$(LIBNAME) $(DESTDIR)$(LIBRARY)

  

diff --git a/media-libs/compface/files/digest-compface-1.4 b/media-libs/compface/files/digest-compface-1.4
index ac7519bc6a92..859eaf0b17ab 100644
--- a/media-libs/compface/files/digest-compface-1.4
+++ b/media-libs/compface/files/digest-compface-1.4
@@ -1 +1 @@
-MD5 c45b54f67cc5d3580a18e4113219bc26 compface-1.4.tar.gz 29154
+MD5 c45b54f67cc5d3580a18e4113219bc26 compface-1.4.tar.gz