From 3b2d0f88f90ef1794c7e6d4e8c11c203542248cc Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Wed, 17 Nov 2004 00:18:57 +0000 Subject: [PATCH] Added DESTDIR patch and set higher versions for required auto* tools. Closes bug #71369. --- media-libs/hermes/ChangeLog | 7 +++- media-libs/hermes/Manifest | 15 ++++++-- .../hermes/files/hermes-1.3.2-destdir.patch | 26 ++++++++++++++ media-libs/hermes/hermes-1.3.2-r2.ebuild | 34 +++++++++++-------- 4 files changed, 65 insertions(+), 17 deletions(-) create mode 100644 media-libs/hermes/files/hermes-1.3.2-destdir.patch 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 + +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 hermes-1.3.2-r2.ebuild: stable on ppc64 diff --git a/media-libs/hermes/Manifest b/media-libs/hermes/Manifest index 30dd091f4619..d24993497a2e 100644 --- a/media-libs/hermes/Manifest +++ b/media-libs/hermes/Manifest @@ -1,4 +1,15 @@ -MD5 b51d24c6bc696a9a1ae955aa7620e3cd ChangeLog 2858 -MD5 f8bad4c9fcfc91e2ffa1f4fe63a98cda hermes-1.3.2-r2.ebuild 1273 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 a23b11e438f9a48de09dcd2f969c5c8d hermes-1.3.2-r2.ebuild 1352 +MD5 6d53a17e7c567d8d007da11cbdda91a3 ChangeLog 3075 MD5 ef39ed830f1e73b4f498305847dc5b9d files/digest-hermes-1.3.2-r2 64 MD5 e314b1d068911c6643ee6c7b4ecbd1ae files/hermes-1.3.2-amd64.patch 6804 +MD5 4d52f1dfb2057a3f9013d0277c696252 files/hermes-1.3.2-destdir.patch 972 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.6 (GNU/Linux) + +iD8DBQFBmpj7ArHZZzCEUG0RAqCDAJ9iNqxSt9PDbEk1/rJWF8NNkV18nQCghXug +XiTSKagd+haF0dWgFa12WfY= +=iiTc +-----END PGP SIGNATURE----- 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* -- 2.26.2