From a130373d5d3905a6d1f018f2b029ec07757951cf Mon Sep 17 00:00:00 2001 From: Jonathan Callen Date: Fri, 1 Jan 2010 03:38:42 +0000 Subject: Add prefix keywords Package-Manager: portage--svn/cvs/Linux i686 --- www-misc/htdig/ChangeLog | 8 ++++++-- www-misc/htdig/Manifest | 14 ++++++++++++-- www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild | 28 ++++++++++++++++------------ 3 files changed, 34 insertions(+), 16 deletions(-) (limited to 'www-misc') diff --git a/www-misc/htdig/ChangeLog b/www-misc/htdig/ChangeLog index 45650ed1956b..e08844a8c20e 100644 --- a/www-misc/htdig/ChangeLog +++ b/www-misc/htdig/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-misc/htdig -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/ChangeLog,v 1.43 2009/12/13 21:57:34 abcd Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/ChangeLog,v 1.44 2010/01/01 03:38:42 abcd Exp $ + + 01 Jan 2010; Jonathan Callen + htdig-3.2.0_beta6-r3.ebuild: + Add prefix keywords 13 Dec 2009; Jonathan Callen -files/3.1.6-ssl.patch, -htdig-3.1.6-r7.ebuild, -htdig-3.1.6-r8.ebuild, diff --git a/www-misc/htdig/Manifest b/www-misc/htdig/Manifest index 2fcfc8a23752..1ad3c19ff7d3 100644 --- a/www-misc/htdig/Manifest +++ b/www-misc/htdig/Manifest @@ -1,7 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX htdig-3.2.0_beta6-as-needed.patch 2244 RMD160 312aa0861fb155f89d6e447063aa06fea523ab2f SHA1 c0f79d84c8321fc5778b7133f338553c21215d44 SHA256 3d0e74896a15f698532d4305f0a2257302ee0d275639b5f1d761cba51a6885fa AUX htdig-3.2.0_beta6-gcc4.patch 541 RMD160 3b684305cee717d6cf4a628fbea6af1b7891164b SHA1 a7db0eca162197556f4ea709822835d50b237015 SHA256 729ea1d0fd415b5b144b2b95bba0575c4eef942f77adfbf54bb69e7da7dd58c3 AUX htdig-3.2.0_beta6-quoting.patch 1130 RMD160 df995515a46234cce7ad8ded7dcd2c508c680a18 SHA1 de725d4c0666992e359279385fe706241fa93c45 SHA256 d84222aa6895305c2ee87f9975bfc348a7872f63ee02a33e862b325f125b8109 DIST htdig-3.2.0b6.tar.gz 3104936 RMD160 621e85920f3452bc1a28a61cf7f8b3e08808bc55 SHA1 106db8c137a3e8f0f5fcf24ac96e01f3515e9cae SHA256 6da9e0ee8627d5302f5685a1b3e5de5f1e6e8df4c0a92c0ca00796bca9e546c8 -EBUILD htdig-3.2.0_beta6-r3.ebuild 1623 RMD160 54cca0e0e2267eaae6a5c2ad02b87b2b97541b07 SHA1 d41b193a30e2cc5aeb32622bd88461e2394b9b02 SHA256 7e447b4d608f4e5e5a9295079ed09cc82cffc51aeb8a2dd1add23019c4588610 -MISC ChangeLog 9835 RMD160 795e54f99341ea6f8b54d353de1bb8aae5aac507 SHA1 4027bad64d7fbaabeb966a566872eb1d8434bfa5 SHA256 e4a6a800c5272328cf6d6563f3deacea364e5766467c1c8f79029b8172cfcea2 +EBUILD htdig-3.2.0_beta6-r3.ebuild 1797 RMD160 1464a983403e29e35efd6a66ee22cee89e29e213 SHA1 423377c2b84796f89156ef0c03969626178f8e2a SHA256 4ee0af3219245424c099aa0d48bf49a058ebfdf7297de6fb6de144ce82bc3340 +MISC ChangeLog 9938 RMD160 9efd4ad2dbbe917c0f3f4f698e6b5ee45f175472 SHA1 97e2304e37b2ecbb4814c8b3a438b830730422a2 SHA256 05ae6ae286d8b5bd52ba5d179ef1851ac86e45b5c7a51e57fb1d9c4cbbb50947 MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAks9bk0ACgkQOypDUo0oQOq2JQCfcx99Pq5UNGE6xYEL2oDK7UE7 +HO0AoJd7kCm5dVwmgOF88Sxmjpske0Qg +=cJqg +-----END PGP SIGNATURE----- diff --git a/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild b/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild index 5ff8f345125f..5cad3352fc11 100644 --- a/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild +++ b/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild,v 1.8 2009/12/13 21:57:34 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild,v 1.9 2010/01/01 03:38:42 abcd Exp $ inherit eutils autotools @@ -13,7 +13,7 @@ SRC_URI="http://www.htdig.org/files/${PN}-${MY_PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" IUSE="ssl" DEPEND=">=sys-libs/zlib-1.1.3 @@ -31,29 +31,33 @@ src_unpack() { } src_compile() { + use prefix || EPREFIX= + econf \ - --with-config-dir=/etc/${PN} \ - --with-default-config-file=/etc/${PN}/${PN}.conf \ - --with-database-dir=/var/lib/${PN}/db \ - --with-cgi-bin-dir=/var/www/localhost/cgi-bin \ - --with-search-dir=/var/www/localhost/htdocs/${PN} \ - --with-image-dir=/var/www/localhost/htdocs/${PN} \ + --with-config-dir="${EPREFIX}"/etc/${PN} \ + --with-default-config-file="${EPREFIX}"/etc/${PN}/${PN}.conf \ + --with-database-dir="${EPREFIX}"/var/lib/${PN}/db \ + --with-cgi-bin-dir="${EPREFIX}"/var/www/localhost/cgi-bin \ + --with-search-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \ + --with-image-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \ $(use_with ssl) -# --with-image-url-prefix=file:///var/www/localhost/htdocs/${PN} \ +# --with-image-url-prefix="file://${EPREFIX}/var/www/localhost/htdocs/${PN}" \ emake || die "emake failed" } src_install () { + use prefix || ED="${D}" + emake DESTDIR="${D}" install || die "make install failed" dodoc ChangeLog README dohtml -r htdoc sed -i "s:${D}::g" \ - "${D}"/etc/${PN}/${PN}.conf \ - "${D}"/usr/bin/rundig \ + "${ED}"/etc/${PN}/${PN}.conf \ + "${ED}"/usr/bin/rundig \ || die "sed failed (removing \${D} from installed files)" # symlink htsearch so it can be easily found. see bug #62087 -- cgit v1.2.3-65-gdbad