Fix bug #140388 and ebuild bla config call.

(Portage version: 2.1.1_pre2-r6)
 (Unsigned Manifest commit)

3 files changed, 12 insertions, 276 deletions

diff --git a/www-servers/aolserver/Manifest b/www-servers/aolserver/Manifest
index c19568c6b85f..23dd6ac3e278 100644
--- a/www-servers/aolserver/Manifest
+++ b/www-servers/aolserver/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 4.0.10/Makefile.global 127 RMD160 2c74ef55d6b50c9a5ead02051d4dce4c390bfea6 SHA1 16d22d67fe11482997053b37de8b90e123759049 SHA256 3e1a9db384ce352e2c3266b69b7c138488cefd261286254413b823d5ca9307f4
 MD5 188da2cbedb4c37b6932a413fd21fead files/4.0.10/Makefile.global 127
 RMD160 2c74ef55d6b50c9a5ead02051d4dce4c390bfea6 files/4.0.10/Makefile.global 127
@@ -33,34 +30,19 @@ AUX 4.0.9/config.tcl 16784 RMD160 90219c4fb4a401049b871bb862221edbbbf614c3 SHA1
 MD5 8283909c0fc2061c5c4d4af284ffc3e9 files/4.0.9/config.tcl 16784
 RMD160 90219c4fb4a401049b871bb862221edbbbf614c3 files/4.0.9/config.tcl 16784
 SHA256 f929b62f48109216843ca9c77b3dd1f6cdd5234f9ce4aeb047c1fec56ad81ac4 files/4.0.9/config.tcl 16784
-DIST aolserver-4.0.10-src.tar.gz 599052
-DIST aolserver-4.0.9-src.tar.gz 591904
-EBUILD aolserver-4.0.10.ebuild 5362 RMD160 e42be1dd44f22926d827bf340918b6c23ffb7a38 SHA1 4194195c5b785c14ce78a9437a9efd5e8bf43b19 SHA256 e8a90fc3a314d65d6fbd6555dd2f339d28b731e1554aea14ee9f1b2f1b2377b5
-MD5 e45b8a85c2f2747fa83aa27687480219 aolserver-4.0.10.ebuild 5362
-RMD160 e42be1dd44f22926d827bf340918b6c23ffb7a38 aolserver-4.0.10.ebuild 5362
-SHA256 e8a90fc3a314d65d6fbd6555dd2f339d28b731e1554aea14ee9f1b2f1b2377b5 aolserver-4.0.10.ebuild 5362
-EBUILD aolserver-4.0.9-r1.ebuild 5778 RMD160 ec17c646f3dfa363bcbe26f5e7fddfea783b70fd SHA1 465fbbed5c3c7a740aac63f2039e6318c6f179cd SHA256 23452ed9321975319e24dc72c772ca06408fea92503e8acd48c3ec16fc1662f2
-MD5 9ea13dc5e2ee6c3b7f9c93b1e4d28ccd aolserver-4.0.9-r1.ebuild 5778
-RMD160 ec17c646f3dfa363bcbe26f5e7fddfea783b70fd aolserver-4.0.9-r1.ebuild 5778
-SHA256 23452ed9321975319e24dc72c772ca06408fea92503e8acd48c3ec16fc1662f2 aolserver-4.0.9-r1.ebuild 5778
-MISC ChangeLog 2501 RMD160 2d29635fa3da74585819f27377135f24eb196a32 SHA1 9101e277e9c25c5882453a97d7b2f449a5d46389 SHA256 18a24707391f4b80b39b9045c3ac9e44f2c9cd9dd3875c74d8a2d88ab3aa7a45
-MD5 75140ff28f4ebbe28fb3ab5d9d702146 ChangeLog 2501
-RMD160 2d29635fa3da74585819f27377135f24eb196a32 ChangeLog 2501
-SHA256 18a24707391f4b80b39b9045c3ac9e44f2c9cd9dd3875c74d8a2d88ab3aa7a45 ChangeLog 2501
+DIST aolserver-4.0.10-src.tar.gz 599052 RMD160 71ca0e32006c3d12df25a40c5963d961ad661449 SHA1 961660bec47ee7dd5297bd3f5842a615b738334f SHA256 df4f32fda173f4ef44fbf47bd86d26793fd2b6dde4b117b96b79c1d4fee64019
+EBUILD aolserver-4.0.10.ebuild 5339 RMD160 b05c9f00ec79adbdc9017223eb57ce10a6ea9f8d SHA1 098fdd8c3df941740f7f2125c42c4de3747e6509 SHA256 5a8efbdd89e7add28a0161d3e9befec9fb720eda7b244fe4819231a0497fbbea
+MD5 78efc9a66250c17865e669984c2dc69b aolserver-4.0.10.ebuild 5339
+RMD160 b05c9f00ec79adbdc9017223eb57ce10a6ea9f8d aolserver-4.0.10.ebuild 5339
+SHA256 5a8efbdd89e7add28a0161d3e9befec9fb720eda7b244fe4819231a0497fbbea aolserver-4.0.10.ebuild 5339
+MISC ChangeLog 2654 RMD160 6ed219ac9a8fe2ec8a211fd74b6abd0a443a6164 SHA1 5fae8b6f5524a917b377c42e7f9fd0a915d14841 SHA256 11860cae93a14dd026253574add0e2b3e618c28416c120b1a8526ae29ce130b2
+MD5 c1376a9284afd048b5b39e4a60bc13f5 ChangeLog 2654
+RMD160 6ed219ac9a8fe2ec8a211fd74b6abd0a443a6164 ChangeLog 2654
+SHA256 11860cae93a14dd026253574add0e2b3e618c28416c120b1a8526ae29ce130b2 ChangeLog 2654
 MISC metadata.xml 216 RMD160 a2670ea7da908bcc656106195838999f0b5aae97 SHA1 dcc9a3031107c473960ec4d97ca00065b5f2b225 SHA256 493a3bef8c688b98b0300b6d437ae3e7aff4b2f50d1d9896f4da7ffee2903678
 MD5 99b7ff02b6d7ef5f4808671733078727 metadata.xml 216
 RMD160 a2670ea7da908bcc656106195838999f0b5aae97 metadata.xml 216
 SHA256 493a3bef8c688b98b0300b6d437ae3e7aff4b2f50d1d9896f4da7ffee2903678 metadata.xml 216
-MD5 b993284955fc1d2d6bf6bf8da7ce1c05 files/digest-aolserver-4.0.10 72
-RMD160 6ce6ed173133781f3436ed8c70d61c51d4b46edf files/digest-aolserver-4.0.10 72
-SHA256 d05d456f77b27a88e0a63aaff047c2b58448482109812751bfecddc19392120c files/digest-aolserver-4.0.10 72
-MD5 5bae3a9adad37c840794ce22eb4cb5b0 files/digest-aolserver-4.0.9-r1 71
-RMD160 c9bf52211821c0d68e5a47f4b22d2fab3d1051f9 files/digest-aolserver-4.0.9-r1 71
-SHA256 41dd7a5c3fb48e27c7cfa873dd9a0981675da0a4d4b7ca8a74171486bb8a4b20 files/digest-aolserver-4.0.9-r1 71
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEfybsV3J2n04EauwRAmhGAJ0c+Y7W1qONT7C594PbALsSKydxsgCdGHQ+
-sWMIFz+aBvZi+vi+7KdB0+I=
-=gDFW
------END PGP SIGNATURE-----
+MD5 b90b1c5a23c23b895b4bc4047140d879 files/digest-aolserver-4.0.10 262
+RMD160 26fac62af490561e2d0afd33831e4a140fdf7e4b files/digest-aolserver-4.0.10 262
+SHA256 88061b89e5a7ae6a9949b38d8ad6ec807b3e54539f63df5ee5584c4c9ff8eff5 files/digest-aolserver-4.0.10 262
diff --git a/www-servers/aolserver/aolserver-4.0.9-r1.ebuild b/www-servers/aolserver/aolserver-4.0.9-r1.ebuild
deleted file mode 100644
index 50c0d1817a9f..000000000000
--- a/www-servers/aolserver/aolserver-4.0.9-r1.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/aolserver/aolserver-4.0.9-r1.ebuild,v 1.2 2005/08/23 16:00:57 port001 Exp $
-
-inherit eutils
-
-DESCRIPTION="Webserver with Tcl page scripting"
-HOMEPAGE="http://www.aolserver.com/"
-SRC_URI="mirror://sourceforge/aolserver/${P}-src.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE="nptl"
-
-DEPEND=">=dev-lang/tcl-8.4.3"
-
-ns_host="ns-localhost"
-ns_etc=/etc/${PN}
-ns_pageroot=/var/www/${ns_host}
-ns_serverroot=/var/${PN}
-ns_lib=/usr/lib/${PN}/lib
-ns_bin=/usr/lib/${PN}/bin
-ns_mod=/usr/lib/${PN}/modules
-ns_data=/usr/share/${PN}
-ns_conf=/usr/share/${PN}/include
-ns_doc=/usr/share/doc/${P}
-ns_include=/usr/include/${PN}
-ns_pid=/var/run/${PN}
-ns_log=/var/log/${PN}
-
-ns_inst_bins="nsd/nsd
-	      nsthread/nsthreadtest"
-ns_inst_libs="nsd/libnsd.so
-	      nsthread/libnsthread.so
-	      nsdb/libnsdb.so
-	      nsext/libnsext.so"
-ns_inst_alibs="nspd/libnspd.a"
-ns_inst_mods="nslog/nslog.so
-	      nsperm/nsperm.so
-	      nsdb/nsdb.so
-	      nsext/nsext.so
-	      nscgi/nscgi.so
-	      nssock/nssock.so
-	      nscp/nscp.so"
-ns_inst_includes="nsd/*.h include/*.h"
-ns_inst_docs="ChangeLog
-	README
-	install-sh"
-
-check_tcl_threads() {
-
-	local threads_found=""
-
-	for tcl_install in /var/db/pkg/dev-lang/tcl*; do
-
-		# find the version of tcl installed
-		# in slot 0
-		if grep 0 ${tcl_install}/SLOT > /dev/null; then
-			# check that tcl was compiled with threads
-			# enabled
-			for candidate_flag in `cat ${tcl_install}/USE`; do
-				if [ ${candidate_flag} == threads ]; then
-					threads_found="true"
-				fi
-			done
-		fi
-	done
-
-	if [ -n "${threads_found}" ]; then
-		einfo "tcl was merged with threading enabled"
-	else
-		eerror "tcl was not merged with threading enabled."
-		eerror "please re-emerge tcl with USE=threads"
-		die "threading not enabled in tcl"
-	fi
-}
-
-pkg_setup() {
-
-	check_tcl_threads
-}
-
-src_unpack() {
-
-	unpack ${A}
-	find ${S} -type d -name CVS -prune | xargs rm -rf
-
-	if use nptl; then
-		epatch ${FILESDIR}/${PV}/aolserver-${PV}-nptl.patch
-	fi
-}
-
-src_compile() {
-
-	local myconf
-	myconf="--with-tcl=/usr/lib"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-
-	dodir ${ns_etc}
-	dodir ${ns_pageroot}
-	dodir ${ns_serverroot}
-	dodir ${ns_lib}
-	dodir ${ns_bin}
-	dodir ${ns_mod}
-	dodir ${ns_mod}/tcl
-	dodir ${ns_data}
-	dodir ${ns_conf}
-	dodir ${ns_doc}
-	dodir ${ns_include}
-	dodir ${ns_pid}
-	dodir ${ns_log}
-	dodir /var/run/aolserver
-	keepdir /var/run/aolserver
-
-	enewgroup aolserver
-	enewuser aolserver -1 -1 ${ns_data} aolserver
-
-	chown -R root:aolserver ${D}/${ns_data}
-	chmod -R g+w ${D}/${ns_data}
-	chown -R aolserver:aolserver ${D}/${ns_pageroot}
-	chmod -R g+w ${D}/${ns_pageroot}
-	chown -R aolserver:aolserver ${D}/${ns_serverroot}
-	chmod -R g+w ${D}/${ns_serverroot}
-	chown -R aolserver:aolserver ${D}/${ns_log}
-	chmod -R g+w ${D}/${ns_log}
-	chown -R aolserver:aolserver ${D}/${ns_pid}
-	chmod -R g+w ${D}/${ns_pid}
-	chown -R root:aolserver ${D}/${ns_mod}
-	chmod -R g+w ${D}/${ns_mod}
-	chown aolserver:aolserver ${D}/var/run/aolserver
-	chmod 750 ${D}/var/run/aolserver
-
-	for bin_file in ${ns_inst_bins}; do
-		dobin ${S}/${bin_file}
-	done
-
-	insinto ${ns_lib}
-	for lib_file in ${ns_inst_libs}; do
-		doins ${S}/${lib_file}
-	done
-	for alib_file in ${ns_inst_alibs}; do
-		ranlib ${S}/${alib_file}
-		doins ${S}/${alib_file}
-	done
-
-	insinto ${ns_bin}
-	for mod_file in ${ns_inst_mods}; do
-		doins ${S}/${mod_file}
-	done
-
-	insinto ${ns_include}
-	for include_file in ${ns_inst_includes}; do
-		doins ${S}/${include_file}
-	done
-
-	for doc_file in ${ns_inst_docs}; do
-		dodoc ${doc_file}
-	done
-
-	doman ${S}/doc/*.1 ${S}/doc/*.3 ${S}/doc/*.n
-
-	insinto ${ns_mod}/tcl
-	doins ${S}/tcl/*.tcl
-
-	#doins doesn't recurse
-	#insinto ${ns_pageroot}; doins -r ${S}/tests/*
-	cp -r ${S}/tests/* ${D}/${ns_pageroot}
-
-	insinto ${ns_bin}
-	doins ${S}/nsd/init.tcl
-
-	dodir ${ns_mod}/tcl/nsperm
-	insinto ${ns_mod}/tcl/nsperm
-	doins ${S}/nsperm/*.tcl
-
-	dodir ${ns_etc}/modules/nsperm
-	insinto ${ns_etc}/modules/nsperm
-	for perm_file in passwd group hosts.allow hosts.deny perms; do
-		doins nsperm/${perm_file}
-	done
-
-	insinto ${ns_data}
-	doins sample-config.tcl
-
-	insinto ${ns_conf}
-	doins ${FILESDIR}/${PV}/Makefile.global
-	newins ${S}/include/Makefile.global Makefile.global.orig
-	doins ${S}/include/Makefile.build
-	dosed "s:../include:${ns_conf}:g" /usr/share/aolserver/include/Makefile.build
-	doins ${S}/include/Makefile.module
-	dosed "s:../include:${ns_conf}:g" /usr/share/aolserver/include/Makefile.module
-
-	insinto ${ns_etc}
-	newins ${FILESDIR}/${PV}/config.tcl aolserver.tcl
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${PV}/aolserver.init aolserver
-	chmod 750 ${D}/etc/init.d/aolserver
-}
-
-pkg_postinst () {
-
-	echo
-	einfo "Upgrading:"
-	einfo "  Check /usr/share/aolserver/sample-config.tcl"
-	einfo "  for new configuration options that you may want"
-	einfo "  to use in your existing configuration."
-	echo
-
-	ewarn "Group and user settings for ${PN} have changed since"
-	ewarn "version 4.0.9. If you are upgrading from <= 4.0.9 it is"
-	ewarn "highly recommended you update your ${PN} user and group"
-	ewarn "settings. This can be done by running:"
-	ewarn "ebuild /var/db/pkg/www-servers/${PF}/${PF}.ebuild config"
-	ewarn "If this is your first install of ${PN}, you can safely"
-	ewarn "ignore this message."
-	echo
-}
-
-pkg_config() {
-
-	if [ -n "`egetent group web`" ]
-	then
-		ebegin "Replacing group 'web' with 'aolserver'"
-			# we already added the aolserver group earlier,
-			# so just remove the old web group.
-			groupdel web
-		eend $?
-	fi
-
-	if [ -n "`egetent passwd aolserver`" ]
-	then
-		ebegin "Updating user 'aolserver'"
-			userdel aolserver
-			enewuser aolserver -1 -1 ${ns_data} aolserver
-		eend $?
-	fi
-}
diff --git a/www-servers/aolserver/files/digest-aolserver-4.0.9-r1 b/www-servers/aolserver/files/digest-aolserver-4.0.9-r1
deleted file mode 100644
index 16be30e95b6a..000000000000
--- a/www-servers/aolserver/files/digest-aolserver-4.0.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f502e6f475c782888871fb8b5f9ed4c1 aolserver-4.0.9-src.tar.gz 591904