summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www-servers/thttpd/ChangeLog8
-rw-r--r--www-servers/thttpd/Manifest10
-rw-r--r--www-servers/thttpd/thttpd-2.26.4-r1.ebuild (renamed from www-servers/thttpd/thttpd-2.26.4.ebuild)9
3 files changed, 20 insertions, 7 deletions
diff --git a/www-servers/thttpd/ChangeLog b/www-servers/thttpd/ChangeLog
index 343fad4b7077..ec3a94990235 100644
--- a/www-servers/thttpd/ChangeLog
+++ b/www-servers/thttpd/ChangeLog
@@ -1,6 +1,12 @@
# 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.45 2012/07/13 14:08:26 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.46 2012/08/05 15:50:57 blueness Exp $
+
+*thttpd-2.26.4-r1 (05 Aug 2012)
+
+ 05 Aug 2012; Anthony G. Basile <blueness@gentoo.org> -thttpd-2.26.4.ebuild,
+ +thttpd-2.26.4-r1.ebuild:
+ Move distribution's htdocs to doc dir, bug #429632
*thttpd-2.26.4 (13 Jul 2012)
diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest
index ddf7ee3648d5..b5a39c98a920 100644
--- a/www-servers/thttpd/Manifest
+++ b/www-servers/thttpd/Manifest
@@ -19,13 +19,13 @@ DIST sthttpd-2.26.4.tar.gz 194544 SHA256 78e87979140cbda123c81b4051552242dbbffb5
DIST thttpd-2.25b.tar.gz 132363 RMD160 15020e8d04d27b30c4da3104387a281e35d58025 SHA1 51bc25ef035d7557c869a02ce353580a1cadfa2c SHA256 4ceaa30ef55702d5cfdffdccd3a2dee8d3090e852c18c7ce8d17d692ad0bf024
EBUILD thttpd-2.25b-r7.ebuild 1583 SHA256 86d3377568eb67f552dc482461fe68c0b5173a1db5c3598316f9f55a08019dfe SHA512 e15a48410349d69194ab14c3e405b415bca62fa069ec835cac3049f0c221a2d16adda2963642583be8907e7f550c772f0911a4e2c58a2d6c51541678e1720d13 WHIRLPOOL 11f8887d0259bbaf37561b9d2d2c0bbe09bc5c532ff35169fdf8234ffe8f756df5df36ec4a6682a34d029cb5cbf5e56fe6ac1d390aeb1606f78f8c9de377bd8d
EBUILD thttpd-2.26.2.ebuild 1503 SHA256 a703575c7df57f31ee55b60813bc1e2719938490e9e4bfcd1f4183b6cc0fdb2f SHA512 2e50d9d4140db0d508ffe89594d8d649bb9028749ced7ecfd733aad558104d9b7fb8a2495ffca5a81314b8cac6b9bcc4f2772a522517ce9fd0d20c1f62665be8 WHIRLPOOL 7fa36d534bcacec6e734152d355a955a607cce0021e87a80a7ce5c9c960b4d146bd0f690329b697753879dab3efa58bcdb518689a16c809a9506b04aca124607
-EBUILD thttpd-2.26.4.ebuild 1509 SHA256 479baf1e7af3e18f3f1ac3299de048bd87d80274941b1cf4164be9e0ac2f108c SHA512 203f670f36b5874fd79533783a5363c45661c3723ad2641696350b2534901133f389bda00758324c3a7cc992c4d80606e4a64ca8b7cae5b87a6403b6e3ca5193 WHIRLPOOL 401938203afcfebc0221ee84275144d1c8c4ac2d37453cccfd1706c96bd98d5d985a3861c3220d48b028df567f0891c56114345fa7d6fa3f69e1328cc699f2b3
-MISC ChangeLog 9093 SHA256 209d43ad0c9482050022a0f52493097e8a2fc7c47b7f82990c5f7011016e45bd SHA512 d7c84fea68f83734e6bd3eee908a99c9246fef4f9ba3d7c83e054486b8760b1c8cca414640cfdb03001813f5b65e58404a92b2cf7171becd1d789d97c6aabbac WHIRLPOOL db625a82e7f73b327d04bc7737c089cbb2e9c37e0be6ab3bc0667d30287fa702654f362df9633e7e3761461e65b2a244d48ecdaf976ddffd7b06a26133f039fe
+EBUILD thttpd-2.26.4-r1.ebuild 1688 SHA256 60e6ae323490d9fd7a0a1bfef6ddba504596073028a3db69bea783f29f8d6420 SHA512 5e8e76dc1dcd6c4d342ffb39821daa5800db603f3bddf36c77544910fc7501d05de4bdf3f68712b2d2cb60ba2daa184612e3204d18eb117aaef5f0a9d06e1dd0 WHIRLPOOL 9652b9fe506e44bd45f251a1dab76ed0c4d30b6f678cec85b61d4e1a5d71d096c1beb8a192e39c33635bd67b3de4d4b7f6d1bea30bbe3abde22171495d63b4bf
+MISC ChangeLog 9286 SHA256 1e80157ecccf29fc3b540dace4f572909f1e04358f7f2544289df621809540b5 SHA512 ca33c13dc042b2d7d44dba0e36a96c77aec8df0f4423026bdd2e09d99f7dd9cc6ef302bebff0fb8287c95b8b7f2ecfeb77c027422e8f431e12db39dc27ed5f12 WHIRLPOOL 902dac9359217710357e3b312b0ec06707420aca44fdf503bd40c38827c58ac9bbd1bc97a2ffb081f7d7dc7e2dcdfb42557174fbb97a1af5b4ecf5f137b85583
MISC metadata.xml 234 SHA256 86b598d5029ad9988722ec63434ea041be297ddbb0b2e290025f3b9737427ae9 SHA512 6bae37c6cc1d1145120c93ca1e2dcfe44019a51ef00edbc4ce132dbbe1f349a0eb854d6b0c1e4585fb4026a2142d23cc6ea493fc8ceb1aba7d8e3a404ad81491 WHIRLPOOL ee79d3a53e7c3d2b2af95c299347c823a6e6270eb7130c5dabaf966ef7615c063fced95a444e81165cf7c04543247654afa1195c2dc085e34cc8194a9a63f75e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlAAK+gACgkQl5yvQNBFVTVVegCfWRdXHb/P1sPN2ExB32d3x/uU
-CasAn2gq7PWSFyluBe0GIKba4NjdEsnT
-=07Kt
+iEYEAREIAAYFAlAelmsACgkQl5yvQNBFVTVq5gCglFDu/5aQQNn8YhHnljTtvQQU
+Jc8AoJOdLSKMbWA8bOqNkaU8sncZVv/g
+=qE/n
-----END PGP SIGNATURE-----
diff --git a/www-servers/thttpd/thttpd-2.26.4.ebuild b/www-servers/thttpd/thttpd-2.26.4-r1.ebuild
index 291f08d7937e..aa2666fa3815 100644
--- a/www-servers/thttpd/thttpd-2.26.4.ebuild
+++ b/www-servers/thttpd/thttpd-2.26.4-r1.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.4.ebuild,v 1.1 2012/07/13 14:08:26 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.26.4-r1.ebuild,v 1.1 2012/08/05 15:50:57 blueness Exp $
EAPI="4"
@@ -48,6 +48,13 @@ src_install () {
insinto /etc/thttpd
doins "${FILESDIR}"/thttpd.conf.sample
+
+ docompress -x /usr/share/doc/"${PF}"/htdocs.dist
+
+ mv "${ED}"/var/www/localhost/htdocs \
+ "${ED}"/usr/share/doc/"${PF}"/htdocs.dist
+
+ mkdir "${ED}"/var/www/localhost/htdocs
}
pkg_postinst() {