Added DESTDIR patch and set higher versions for required auto* tools. Closes bug #71369.

3 files changed, 52 insertions, 15 deletions

diff --git a/media-libs/hermes/ChangeLog b/media-libs/hermes/ChangeLog
index c6766ee1e71e..84e5875c7bf5 100644
--- a/media-libs/hermes/ChangeLog
+++ b/media-libs/hermes/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/hermes
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/hermes/ChangeLog,v 1.17 2004/07/23 19:58:48 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/hermes/ChangeLog,v 1.18 2004/11/17 00:18:57 eradicator Exp $
+
+  16 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/hermes-1.3.2-destdir.patch, hermes-1.3.2-r2.ebuild:
+  Added DESTDIR patch and set higher versions for required auto* tools. Closes
+  bug #71369.
 
   23 Jul 2004; Tom Gall <tgall@gentoo.org> hermes-1.3.2-r2.ebuild:
   stable on ppc64
diff --git a/media-libs/hermes/files/hermes-1.3.2-destdir.patch b/media-libs/hermes/files/hermes-1.3.2-destdir.patch
new file mode 100644
index 000000000000..9399b31239cc
--- /dev/null
+++ b/media-libs/hermes/files/hermes-1.3.2-destdir.patch
@@ -0,0 +1,26 @@
+diff -Naur Hermes-1.3.2.orig/configure.in Hermes-1.3.2/configure.in
+--- Hermes-1.3.2.orig/configure.in	2000-07-05 06:50:25.000000000 -0700
++++ Hermes-1.3.2/configure.in	2004-11-16 16:14:27.800924711 -0800
+@@ -42,6 +42,7 @@
+ dnl ---------------------------------------------------------------------
+ dnl Checks for programs.
+ 
++AM_PROG_AS
+ AC_PROG_CC
+ AC_PROG_CPP
+ AC_PROG_MAKE_SET
+diff -Naur Hermes-1.3.2.orig/src/Makefile.am Hermes-1.3.2/src/Makefile.am
+--- Hermes-1.3.2.orig/src/Makefile.am	2000-01-23 08:14:14.000000000 -0800
++++ Hermes-1.3.2/src/Makefile.am	2004-11-16 16:13:20.626745550 -0800
+@@ -32,9 +32,9 @@
+ 	cp $@ `echo $@ | sed -e 's/\.lo$$/.o/'`
+ 
+ install-data-local:
+-	$(INSTALL) -m 0755 -d $(includedir)/Hermes
++	$(INSTALL) -m 0755 -d $(DESTDIR)$(includedir)/Hermes
+ 	for incfile in $(publicheaders); do \
+-	  $(INSTALL) -m 0644 $$incfile $(includedir)/Hermes; \
++	  $(INSTALL) -m 0644 $$incfile $(DESTDIR)$(includedir)/Hermes; \
+ 	done
+ 
+ uninstall-local:
diff --git a/media-libs/hermes/hermes-1.3.2-r2.ebuild b/media-libs/hermes/hermes-1.3.2-r2.ebuild
index f4174e503cbe..8c6d839f74ad 100644
--- a/media-libs/hermes/hermes-1.3.2-r2.ebuild
+++ b/media-libs/hermes/hermes-1.3.2-r2.ebuild
@@ -1,11 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/hermes/hermes-1.3.2-r2.ebuild,v 1.24 2004/07/23 19:58:48 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/hermes/hermes-1.3.2-r2.ebuild,v 1.25 2004/11/17 00:18:57 eradicator Exp $
 
-inherit eutils gnuconfig
+IUSE=""
+
+inherit eutils libtool gnuconfig
 
 MY_P=${P/h/H}
 S=${WORKDIR}/${MY_P}
+
 DESCRIPTION="Library for fast colorspace conversion and other graphics routines"
 HOMEPAGE="http://hermes.terminal.at/"
 SRC_URI="http://dark.x.dtu.dk/~mbn/clanlib/download/download-sphair/${MY_P}.tar.gz"
@@ -13,34 +16,37 @@ SRC_URI="http://dark.x.dtu.dk/~mbn/clanlib/download/download-sphair/${MY_P}.tar.
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha ~mips amd64 ~hppa ppc64"
-IUSE=""
 
-DEPEND="sys-devel/libtool
-	sys-devel/automake
-	sys-devel/autoconf"
+DEPEND=">=sys-devel/autoconf-2.50
+	>=sys-devel/automake-1.8"
 
 RDEPEND="virtual/libc"
 
-src_unpack() {
+asrc_unpack() {
 	unpack ${A} || die
 	cd ${S} || die
-	epatch ${FILESDIR}/hermes-1.3.2-amd64.patch
-	gnuconfig_update
+	epatch ${FILESDIR}/${P}-amd64.patch
+	epatch ${FILESDIR}/${P}-destdir.patch
+
+	export WANT_AUTOMAKE=1.8
+	export WANT_AUTOCONF=2.5
+
 	aclocal || die "aclocal failed"
-	env WANT_AUTOMAKE=1.4 automake -a || die "automake failed"
+	automake -a || die "automake failed"
 	autoconf || die "autoconf failed"
+
+	gnuconfig_update
+	elibtoolize
 }
 
-src_compile() {
+asrc_compile() {
 	econf || die
 	sh ltconfig ltmain.sh || die "ltconfig failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	make \
-		prefix=${D}/usr \
-		install || die
+	make DESTDIR="${D}" install || die
 
 	dodoc AUTHORS ChangeLog FAQ NEWS README TODO*