Version bump, remove old

(Portage version: 2.1.3.19)

3 files changed, 10 insertions, 139 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 5e82a9aa3ae1..9d66b8931e96 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/webmin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.162 2008/01/24 18:08:09 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.163 2008/02/09 20:07:20 armin76 Exp $
+
+*webmin-1.400 (09 Feb 2008)
+
+  09 Feb 2008; Raúl Porcel <armin76@gentoo.org> -webmin-1.370.ebuild,
+  -webmin-1.370-r1.ebuild, +webmin-1.400.ebuild:
+  Version bump, remove old
 
   24 Jan 2008; nixnut <nixnut@gentoo.org> webmin-1.390.ebuild:
   Stable on ppc wrt bug 207049
diff --git a/app-admin/webmin/webmin-1.370-r1.ebuild b/app-admin/webmin/webmin-1.370-r1.ebuild
deleted file mode 100644
index 3965606621aa..000000000000
--- a/app-admin/webmin/webmin-1.370-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.370-r1.ebuild,v 1.1 2007/10/30 10:36:06 uberlord Exp $
-
-inherit eutils pam
-
-VM_V="3.23"
-
-DESCRIPTION="Webmin, a web-based system administration interface"
-HOMEPAGE="http://www.webmin.com/"
-SRC_URI="webmin-minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
-	!webmin-minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz
-			http://www.webmin.com/download/virtualmin/virtual-server-${VM_V}.gpl.wbm.gz )"
-
-LICENSE="BSD"
-SLOT="0"
-# ~mips removed because of broken deps. Bug #86085
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="apache2 pam postgres ssl webmin-minimal"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	ssl? ( dev-perl/Net-SSLeay )
-	postgres? ( dev-perl/DBD-Pg )
-	pam? ( dev-perl/Authen-PAM )
-	dev-perl/XML-Generator
-	virtual/logger"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	# in webmin-minimal apache2 are not present
-	if ! use webmin-minimal ; then
-		# Bug #50810, #51943
-		if use apache2; then
-			epatch "${FILESDIR}"/${PN}-1.140-apache2.patch
-		fi
-
-		# Correct ldapness
-		epatch "${FILESDIR}"/${PN}-1.270-ldap-useradmin.patch
-
-		# Postfix should modify the last entry of the maps file
-		epatch "${FILESDIR}"/${PN}-1.300-postfix.patch
-
-		mv ${WORKDIR}/virtual-server-${VM_V}.gpl.wbm ${T}/vs.tar
-		tar -xf ${T}/vs.tar
-
-		# Don't create ${HOME}/cgi-bin on new accounts
-		epatch "${FILESDIR}"/virtual-server-3.23-nocgibin.patch
-
-		# Verify Postgres usernames
-		epatch "${FILESDIR}"/virtual-server-3.23-pgsql.patch
-	fi
-
-	epatch "${FILESDIR}"/${PN}-1.170-setup-nocheck.patch
-}
-
-src_install() {
-	# Bug #97212
-	addpredict /var/lib/rpm
-
-	rm -f mount/freebsd-mounts*
-	rm -f mount/openbsd-mounts*
-	rm -f mount/macos-mounts*
-
-	(find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-	dodir /usr/libexec/webmin
-	dodir /var
-
-	cp -rp * ${D}/usr/libexec/webmin
-
-	# in webmin-minimal openslp is not present
-	if [ ! -f "${D}/usr/libexec/webmin/openslp/config-gentoo-linux" ] ; then
-		cp ${D}/usr/libexec/webmin/openslp/config \
-			${D}/usr/libexec/webmin/openslp/config-gentoo-linux
-	fi
-
-	newinitd "${FILESDIR}"/init.d.webmin webmin
-
-	newpamd "${FILESDIR}"/webmin-pam webmin
-	echo gentoo > ${D}/usr/libexec/webmin/install-type
-
-	# Fix ownership
-	chown -R root:0 ${D}
-
-	dodir /etc/webmin
-	dodir /var/log/webmin
-
-	config_dir=${D}/etc/webmin
-	var_dir=${D}/var/log/webmin
-	perl=/usr/bin/perl
-	autoos=1
-	port=10000
-	login=root
-	crypt="XXX"
-	host=`hostname`
-	use ssl && ssl=1 || ssl=0
-	atboot=0
-	nostart=1
-	nochown=1
-	autothird=1
-	nouninstall=1
-	noperlpath=1
-	tempdir="${T}"
-	export config_dir var_dir perl autoos port login crypt host ssl atboot nostart nochown autothird nouninstall noperlpath tempdir
-	${D}/usr/libexec/webmin/setup.sh > ${T}/webmin-setup.out 2>&1 || die "Failed to create initial webmin configuration."
-
-	# Fixup the config files to use their real locations
-	sed -i -e "s:^pidfile=.*$:pidfile=/var/run/webmin.pid:" ${D}/etc/webmin/miniserv.conf
-	find ${D}/etc/webmin -type f | xargs sed -i -e "s:${D}:/:g"
-
-	# Cleanup from the config script
-	rm -rf ${D}/var/log/webmin
-	keepdir /var/log/webmin/
-
-	# Get rid of this crap...
-	rm -rf ${D}/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1
-	rm -f ${D}/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1.tar.gz
-}
-
-pkg_postinst() {
-	local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
-	crypt=${crypt//\\/\\\\}
-	crypt=${crypt//\//\\\/}
-	sed -i -e "s/root:XXX/root:${crypt}/" "${ROOT}/etc/webmin/miniserv.users"
-
-	einfo "To make webmin start at boot time, run: 'rc-update add webmin default'."
-	use ssl && einfo "Point your web browser to https://localhost:10000 to use webmin."
-	use ssl || einfo "Point your web browser to http://localhost:10000 to use webmin."
-}
diff --git a/app-admin/webmin/webmin-1.370.ebuild b/app-admin/webmin/webmin-1.400.ebuild
index ad378b3f8237..e79bd19dba3d 100644
--- a/app-admin/webmin/webmin-1.370.ebuild
+++ b/app-admin/webmin/webmin-1.400.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.370.ebuild,v 1.2 2007/10/28 12:43:28 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.400.ebuild,v 1.1 2008/02/09 20:07:20 armin76 Exp $
 
 inherit eutils pam
 
@@ -15,7 +15,7 @@ SRC_URI="webmin-minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
 LICENSE="BSD"
 SLOT="0"
 # ~mips removed because of broken deps. Bug #86085
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="apache2 pam postgres ssl webmin-minimal"
 
 DEPEND="dev-lang/perl"
@@ -41,9 +41,6 @@ src_unpack() {
 		# Correct ldapness
 		epatch "${FILESDIR}"/${PN}-1.270-ldap-useradmin.patch
 
-		# Postfix should modify the last entry of the maps file
-		epatch "${FILESDIR}"/${PN}-1.300-postfix.patch
-
 		mv ${WORKDIR}/virtual-server-${VM_V}.gpl.wbm ${T}/vs.tar
 		tar -xf ${T}/vs.tar