From 9fa8adfa77259151cc6088167c31f9060c29d0da Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Sat, 7 Apr 2007 17:39:55 +0000 Subject: [PATCH] Fix broken autotools handling thanks jakub, bug 160047 Package-Manager: portage-2.1.2.3 --- net-print/omni/ChangeLog | 5 ++++- net-print/omni/Manifest | 16 ++++++++-------- net-print/omni/omni-0.9.2.ebuild | 23 ++++++++++++----------- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/net-print/omni/ChangeLog b/net-print/omni/ChangeLog index 1b080a92c549..f9c4d967eab6 100644 --- a/net-print/omni/ChangeLog +++ b/net-print/omni/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-print/omni # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/omni/ChangeLog,v 1.11 2007/04/07 16:01:57 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/omni/ChangeLog,v 1.12 2007/04/07 17:39:55 genstef Exp $ + + 07 Apr 2007; Stefan Schweizer omni-0.9.2.ebuild: + Fix broken autotools handling thanks jakub, bug 160047 07 Apr 2007; Stefan Schweizer omni-0.9.1.ebuild, omni-0.9.2.ebuild: diff --git a/net-print/omni/Manifest b/net-print/omni/Manifest index 272d54924bac..b695ae0e3a5d 100644 --- a/net-print/omni/Manifest +++ b/net-print/omni/Manifest @@ -15,14 +15,14 @@ EBUILD omni-0.9.1.ebuild 1555 RMD160 b88cb4c0b1a0f3eef3e370475a68225205ef61c8 SH MD5 dbcabb48de3b82676481474a87b25176 omni-0.9.1.ebuild 1555 RMD160 b88cb4c0b1a0f3eef3e370475a68225205ef61c8 omni-0.9.1.ebuild 1555 SHA256 7dde264bf99b3950344acc10f1662ebb1d4ee2c3f620311d9a4241e8724c2f37 omni-0.9.1.ebuild 1555 -EBUILD omni-0.9.2.ebuild 1783 RMD160 10b152838043d2fbf9e4abe7ecdb7cd04d57ac54 SHA1 741df86d0f65443c5ed3a786031eca46436bf6c1 SHA256 d234e823b521ef0236d473fa75e26c9ca74eef565e5eed504e848969e4837471 -MD5 71b79326ef95dcd945a4013d97f39063 omni-0.9.2.ebuild 1783 -RMD160 10b152838043d2fbf9e4abe7ecdb7cd04d57ac54 omni-0.9.2.ebuild 1783 -SHA256 d234e823b521ef0236d473fa75e26c9ca74eef565e5eed504e848969e4837471 omni-0.9.2.ebuild 1783 -MISC ChangeLog 1373 RMD160 698e3b0adcd2c7e77265227a58a4ccf8f79ec2c0 SHA1 31d6a4c5bc53c8d0951e56eb7c88ca92642c72af SHA256 b775b9d56e5bbcb59f07379987ac488f6b41638e2ae1c3fe51510537663fe866 -MD5 775f6b49f53d88bc7b276ae5e46748cf ChangeLog 1373 -RMD160 698e3b0adcd2c7e77265227a58a4ccf8f79ec2c0 ChangeLog 1373 -SHA256 b775b9d56e5bbcb59f07379987ac488f6b41638e2ae1c3fe51510537663fe866 ChangeLog 1373 +EBUILD omni-0.9.2.ebuild 1831 RMD160 099e3a2e7c2ee53bb98bca284a95231ef579389a SHA1 0681b371c20815fa0b86c6448b9829ea6a7a024f SHA256 d4d8c3c0b125c0a381ce25049c74879846c442801fd88bbecb61a17e43ad10a8 +MD5 10ee811e32be9e5156fd903c95f865cd omni-0.9.2.ebuild 1831 +RMD160 099e3a2e7c2ee53bb98bca284a95231ef579389a omni-0.9.2.ebuild 1831 +SHA256 d4d8c3c0b125c0a381ce25049c74879846c442801fd88bbecb61a17e43ad10a8 omni-0.9.2.ebuild 1831 +MISC ChangeLog 1503 RMD160 29fc662b282049ed9b7c6d1b975d9ce1cc1e1470 SHA1 191eacdf30c77009bc82bae9e070ea23ea5699c7 SHA256 b8aa205f3e83587ec95eb1811f71a2c1176369caa5caba323f25aa27e8e97769 +MD5 47e18b5739f90b7a3a34246337800c71 ChangeLog 1503 +RMD160 29fc662b282049ed9b7c6d1b975d9ce1cc1e1470 ChangeLog 1503 +SHA256 b8aa205f3e83587ec95eb1811f71a2c1176369caa5caba323f25aa27e8e97769 ChangeLog 1503 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161 diff --git a/net-print/omni/omni-0.9.2.ebuild b/net-print/omni/omni-0.9.2.ebuild index 2edfd41b315a..d474c9cbbd5a 100644 --- a/net-print/omni/omni-0.9.2.ebuild +++ b/net-print/omni/omni-0.9.2.ebuild @@ -1,8 +1,11 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/omni/omni-0.9.2.ebuild,v 1.4 2007/04/07 16:01:57 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/omni/omni-0.9.2.ebuild,v 1.5 2007/04/07 17:39:55 genstef Exp $ -inherit eutils +WANT_AUTOMAKE="1.6" +WANT_AUTOCONF="latest" + +inherit eutils autotools DESCRIPTION="Omni provides support for many printers with a pluggable framework (easy to add devices)" HOMEPAGE="http://sourceforge.net/projects/omniprint" @@ -40,28 +43,26 @@ src_compile() { $(use_enable cups) \ $(use_enable static)" - export WANT_AUTOMAKE="1.6" - export WANT_AUTOCONF="2.5" - - libtoolize --copy --force + eautoreconf - LC_ALL="" LC_NUMERIC="" LANG="" ./setupOmni ${myconf} --disable-device-xml --enable-device-compile || die + LC_ALL="" LC_NUMERIC="" LANG="" ./setupOmni ${myconf} --disable-device-xml --enable-device-compile \ + || die "setup0mni failed" if use ppds && use cups; then sed -i -e "s/model\/foomatic/model\/omni/g" CUPS/Makefile \ || die 'sed failed' - make -C CUPS generateBuildPPDs || die + make -C CUPS generateBuildPPDs || die "make failed" fi } src_install () { - make DESTDIR=${D} install || die + make DESTDIR="${D}" install || die "make install failed" dodoc docs/* # never forget this! ;-) - use doc && dodoc ${DISTDIR}/OmniArchitecture.0.3.pdf + use doc && dodoc "${DISTDIR}"/OmniArchitecture.0.3.pdf if use foomaticdb; then - cd ${D} + cd "${D}" unpack omni-${PV}-foomatic.tar.bz2 fi } -- 2.26.2