Version bump and remove old

(Portage version: 2.1.9.49/cvs/Linux x86_64)

3 files changed, 23 insertions, 145 deletions

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index 1f8456aac564..2571a48515bb 100644
--- a/app-crypt/mit-krb5/ChangeLog
+++ b/app-crypt/mit-krb5/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/mit-krb5
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.280 2011/05/06 07:54:31 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.281 2011/05/25 05:56:01 eras Exp $
+
+*mit-krb5-1.8.4 (25 May 2011)
+
+  25 May 2011; Eray Aslan <eras@gentoo.org> +mit-krb5-1.8.4.ebuild,
+  -mit-krb5-1.9-r3.ebuild, -mit-krb5-1.9-r4.ebuild:
+  Version bump and remove old
 
 *mit-krb5-1.9.1 (06 May 2011)
 
diff --git a/app-crypt/mit-krb5/mit-krb5-1.9-r3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.8.4.ebuild
index ac62ffc86b7a..c65cd9865b97 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.9-r3.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.8.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.9-r3.ebuild,v 1.1 2011/04/14 06:38:45 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.8.4.ebuild,v 1.1 2011/05/25 05:56:01 eras Exp $
 
-EAPI=3
+EAPI=2
 
 inherit eutils flag-o-matic versionator
 
-MY_P="${P/mit-}"
+MY_P=${P/mit-}
 P_DIR=$(get_version_component_range 1-2)
 DESCRIPTION="MIT Kerberos V"
 HOMEPAGE="http://web.mit.edu/kerberos/www/"
@@ -14,18 +14,18 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc +keyutils openldap +pkinit +threads test xinetd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc openldap test xinetd"
 
 RDEPEND="!!app-crypt/heimdal
 	>=sys-libs/e2fsprogs-libs-1.41.0
-	keyutils? ( sys-apps/keyutils )
+	sys-apps/keyutils
 	openldap? ( net-nds/openldap )
 	xinetd? ( sys-apps/xinetd )"
 DEPEND="${RDEPEND}
 	doc? ( virtual/latex-base )
-	test? ( dev-lang/tcl
-	        dev-lang/python
+	test? (	dev-lang/tcl
+			dev-lang/perl
 			dev-util/dejagnu )"
 
 S=${WORKDIR}/${MY_P}/src
@@ -36,27 +36,20 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/CVE-2010-4022.patch"
-	epatch "${FILESDIR}/CVE-2011-0281.0282.0283.patch"
-	epatch "${FILESDIR}/CVE-2011-0284.patch"
-	epatch "${FILESDIR}/CVE-2011-0285.patch"
+	epatch "${FILESDIR}/mit-krb5_testsuite.patch"
 }
 
 src_configure() {
-	append-flags "-I${EPREFIX}/usr/include/et"
-	use keyutils || export ac_cv_header_keyutils_h=no
+	append-flags "-I/usr/include/et"
 	econf \
 		$(use_with openldap ldap) \
-		"$(use_with test tcl "${EPREFIX}/usr")" \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
+		$(use_with test tcl /usr) \
 		--without-krb4 \
-		--without-hesiod \
 		--enable-shared \
 		--with-system-et \
 		--with-system-ss \
 		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
+		--enable-kdc-replay-cache \
 		--disable-rpath
 }
 
@@ -74,14 +67,14 @@ src_compile() {
 src_install() {
 	emake \
 		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		EXAMPLEDIR="/usr/share/doc/${PF}/examples" \
 		install || die "install failed"
 
 	# default database dir
 	keepdir /var/lib/krb5kdc
 
 	cd ..
-	dodoc NOTICE README
+	dodoc README
 	dodoc doc/*.{ps,txt}
 	doinfo doc/*.info*
 	dohtml -r doc/*.html
@@ -95,9 +88,9 @@ src_install() {
 	newinitd "${FILESDIR}"/mit-krb5kdc.initd mit-krb5kdc || die
 
 	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	newins "${D}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
 	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+	newins "${D}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
 
 	if use openldap ; then
 		insinto /etc/openldap/schema
diff --git a/app-crypt/mit-krb5/mit-krb5-1.9-r4.ebuild b/app-crypt/mit-krb5/mit-krb5-1.9-r4.ebuild
deleted file mode 100644
index cbeb899da9be..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.9-r4.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.9-r4.ebuild,v 1.1 2011/04/22 14:03:18 eras Exp $
-
-EAPI=3
-
-inherit eutils flag-o-matic versionator
-
-MY_P="${P/mit-}"
-P_DIR=$(get_version_component_range 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="http://web.mit.edu/kerberos/www/"
-SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc +keyutils openldap +pkinit +threads test xinetd"
-
-RDEPEND="!!app-crypt/heimdal
-	>=sys-libs/e2fsprogs-libs-1.41.0
-	keyutils? ( sys-apps/keyutils )
-	openldap? ( net-nds/openldap )
-	xinetd? ( sys-apps/xinetd )"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )
-	test? ( dev-lang/tcl
-	        dev-lang/python
-			dev-util/dejagnu )"
-
-S=${WORKDIR}/${MY_P}/src
-
-src_unpack() {
-	unpack ${A}
-	unpack ./"${MY_P}".tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/CVE-2010-4022.patch"
-	epatch "${FILESDIR}/CVE-2011-0281.0282.0283.patch"
-	epatch "${FILESDIR}/CVE-2011-0284.patch"
-	epatch "${FILESDIR}/CVE-2011-0285.patch"
-}
-
-src_configure() {
-	append-flags "-I${EPREFIX}/usr/include/et"
-	use keyutils || export ac_cv_header_keyutils_h=no
-	econf \
-		$(use_with openldap ldap) \
-		"$(use_with test tcl "${EPREFIX}/usr")" \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		--without-krb4 \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--disable-rpath
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-
-	if use doc ; then
-		cd ../doc
-		for dir in api implement ; do
-			emake -C "${dir}" || die "doc emake failed"
-		done
-	fi
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install || die "install failed"
-
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc NOTICE README
-	dodoc doc/*.{ps,txt}
-	doinfo doc/*.info*
-	dohtml -r doc/*.html
-
-	# die if we cannot respect a USE flag
-	if use doc ; then
-	    dodoc doc/{api,implement}/*.ps || die "dodoc failed"
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd mit-krb5kadmind || die
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd mit-krb5kdc || die
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd mit-krb5kpropd || die
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema" || die
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd || die
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-1.8.0" ; then
-		elog "MIT split the Kerberos applications from the base Kerberos"
-		elog "distribution.  Kerberized versions of telnet, rlogin, rsh, rcp,"
-		elog "ftp clients and telnet, ftp deamons now live in"
-		elog "\"app-crypt/mit-krb5-appl\" package."
-	fi
-}