Fix for prefix and add ~amd64-linux and ~x86-linux keywords.

Package-Manager: portage-2.2.0_alpha100_p7/cvs/Linux i686

3 files changed, 16 insertions, 13 deletions

diff --git a/www-servers/thttpd/ChangeLog b/www-servers/thttpd/ChangeLog
index 95677dad2edb..fecd76900647 100644
--- a/www-servers/thttpd/ChangeLog
+++ b/www-servers/thttpd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/thttpd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.37 2012/04/04 15:05:37 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.38 2012/04/14 03:57:26 zmedico Exp $
+
+  14 Apr 2012; Zac Medico <zmedico@gentoo.org> thttpd-2.26.2.ebuild:
+  Fix for prefix and add ~amd64-linux and ~x86-linux keywords.
 
   04 Apr 2012; Anthony G. Basile <blueness@gentoo.org> -thttpd-2.25b-r8.ebuild,
   -thttpd-2.25b-r9.ebuild,
diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest
index 330b8f745605..a6c30564c573 100644
--- a/www-servers/thttpd/Manifest
+++ b/www-servers/thttpd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX thttpd-2.25/additional-input-validation-httpd.c.diff 2249 RMD160 ad101512e54d1c154dc039d616067456e0130a7e SHA1 88eebce793c19d16a7a394b6142f412d92e511a2 SHA256 28fb9fa693a636df82627701df1e777bc28ffcefe90132391cbed1dc901ce51c
 AUX thttpd-2.25/fix-buffer-overflow.diff 947 RMD160 30b80b19e792e0dce3eb238f664501a61bc5a3a7 SHA1 645316b836c731dc0385cfa7851c4dea8edc530c SHA256 3ef0b098398b052eb37711d1a0eb2f0cff556f606c3427d1d0529042368ce1ad
@@ -15,13 +15,13 @@ AUX thttpd.logrotate 197 RMD160 28c782571b226e49680a80bcbe5313ccc2a92d5c SHA1 38
 DIST sthttpd-2.26.2.tar.gz 194591 RMD160 ea1275187a75035e7b1c2e08c49f538074539caf SHA1 b1c929025d1db96cec6088b84ba3c60c9a10d92c SHA256 605f54371211bd11b6c75fb56899ead62118ecf80fca90c21656eacb76cd60d2
 DIST thttpd-2.25b.tar.gz 132363 RMD160 15020e8d04d27b30c4da3104387a281e35d58025 SHA1 51bc25ef035d7557c869a02ce353580a1cadfa2c SHA256 4ceaa30ef55702d5cfdffdccd3a2dee8d3090e852c18c7ce8d17d692ad0bf024
 EBUILD thttpd-2.25b-r7.ebuild 1578 RMD160 b8cdcfc2fc24fdcd8c0ccef8999ac633bd3e32d8 SHA1 18e4c99ec97d51731563105c29b5b443c29e0072 SHA256 df2f96c1da3633d0799fb250544bde270d936ebf0fea4f414f09569457fe1d3d
-EBUILD thttpd-2.26.2.ebuild 1434 RMD160 3660b7aca72adeb0a6db58d50bf19d04498e0ccc SHA1 f8f1faa64afd49ab798990ff474e83c14148a00e SHA256 8c27e2f29505c1a4f22cb31e459037095ba63d41180e02ee03c43aeefa631012
-MISC ChangeLog 8095 RMD160 43d4650f9e3033fc2731428080d5411cfa25b5f3 SHA1 e32f27c68f6766780dd7bff2109c45cd38d4703c SHA256 baff8bb4333b0646728c270e5a1f897e5d5c00c9a8f5e18f2f933094045d3363
+EBUILD thttpd-2.26.2.ebuild 1469 RMD160 ce3d08157c63fd37f99621b7511dbed95488878b SHA1 95dbb505907de3507dd089983ad2a45550cfe1e8 SHA256 8acfcb7f5b7ecdfa0a5cc5565b956c8c75e47031a8e26e5a4aa4203a93fa34df
+MISC ChangeLog 8227 RMD160 be556122e035cc44123b7dd08e3a913fe64cbbfb SHA1 694ad4349bbce5af05aae98b53aa021384bb0215 SHA256 2a76a9e6370ec2b2db6196e6cf2fde3ad54a53c1564642c5f04795a9ad1408b0
 MISC metadata.xml 234 RMD160 59e569023e48130b98d1b9f67416af7ef133a7c5 SHA1 8c7c05396c1846e09239cef8844ef3417ce96bbc SHA256 86b598d5029ad9988722ec63434ea041be297ddbb0b2e290025f3b9737427ae9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAk98Y0oACgkQl5yvQNBFVTULJACdF5KslZBWl99tumz1J9HHMgVd
-BJMAn0nD7puT+YKRU5TmvvK+JNEvKfPi
-=KE7e
+iEYEARECAAYFAk+I9awACgkQ/ejvha5XGaNKkwCgxXomKArEumQCXcRXYj0OiuzE
+gZ0An3kFobZSR+P/axOSiH1dqc48hZBA
+=2opp
 -----END PGP SIGNATURE-----
diff --git a/www-servers/thttpd/thttpd-2.26.2.ebuild b/www-servers/thttpd/thttpd-2.26.2.ebuild
index ea0fcafc1f22..a91574574bfd 100644
--- a/www-servers/thttpd/thttpd-2.26.2.ebuild
+++ b/www-servers/thttpd/thttpd-2.26.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.26.2.ebuild,v 1.1 2012/04/04 12:24:20 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.26.2.ebuild,v 1.2 2012/04/14 03:57:26 zmedico Exp $
 
 EAPI="4"
 
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
@@ -23,7 +23,7 @@ DEPEND=""
 
 THTTPD_USER=thttpd
 THTTPD_GROUP=thttpd
-THTTPD_DOCROOT="/var/www/localhost/htdocs"
+THTTPD_DOCROOT="${EPREFIX}/var/www/localhost/htdocs"
 
 DOCS=( README TODO )
 
@@ -51,9 +51,9 @@ src_install () {
 }
 
 pkg_postinst() {
-	chown root:${THTTPD_GROUP} "${ROOT}/usr/sbin/makeweb" \
+	chown root:${THTTPD_GROUP} "${EROOT}/usr/sbin/makeweb" \
 		|| die "Failed chown makeweb"
-	chmod 2751 "${ROOT}/usr/sbin/makeweb" \
+	chmod 2751 "${EROOT}/usr/sbin/makeweb" \
 		|| die "Failed chmod makeweb"
 	chmod 755 "${THTTPD_DOCROOT}/cgi-bin/printenv" \
 		|| die "Failed chmod printenv"