fixed Bug 300498 and removed old mit-krb5-1.7 release

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 13 insertions, 102 deletions

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index 3bbcfe352c1e..2162170106dc 100644
--- a/app-crypt/mit-krb5/ChangeLog
+++ b/app-crypt/mit-krb5/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/mit-krb5
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.212 2009/07/29 08:27:48 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.213 2010/01/12 09:32:42 mueli Exp $
+
+  12 Jan 2010; Michael Hammer <mueli@gentoo.org> mit-krb5-1.6.3-r6.ebuild,
+  -mit-krb5-1.7.ebuild, mit-krb5-1.7-r1.ebuild:
+  - fixed Bug 300498
+  - removed old 1.7 release
 
 *mit-krb5-1.7-r1 (29 Jul 2009)
 
diff --git a/app-crypt/mit-krb5/mit-krb5-1.6.3-r6.ebuild b/app-crypt/mit-krb5/mit-krb5-1.6.3-r6.ebuild
index ca2344cf426e..9356356cd2e8 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.6.3-r6.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.6.3-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.6.3-r6.ebuild,v 1.3 2009/04/08 17:53:57 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.6.3-r6.ebuild,v 1.4 2010/01/12 09:32:42 mueli Exp $
 
 inherit eutils flag-o-matic versionator autotools
 
@@ -30,7 +30,7 @@ src_unpack() {
 	unpack ${A}
 	unpack ./${MY_P}.tar.gz
 	cd "${S}"
-	EPATCH_SUFFIX="patch" epatch "${PATCHDIR}"
+	EPATCH_SOURCE="${WORKDIR}/patch" EPATCH_SUFFIX="patch" epatch
 	epatch "${FILESDIR}/CVE-2009-0844+CVE-2009-0847.patch"
 	epatch "${FILESDIR}/CVE-2009-0846.patch"
 	einfo "Regenerating configure scripts (be patient)"
diff --git a/app-crypt/mit-krb5/mit-krb5-1.7-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.7-r1.ebuild
index fa1f1debd860..7e83b850cf83 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.7-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.7-r1.ebuild,v 1.1 2009/07/29 08:27:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.7-r1.ebuild,v 1.2 2010/01/12 09:32:42 mueli Exp $
 
 inherit eutils flag-o-matic versionator
 
@@ -10,8 +10,7 @@ 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
-http://dev.gentoo.org/~mueli/kerberos/${P}-patches-${PATCHV}.tar.bz2"
-#	mirror://gentoo/${P}-patches-${PATCHV}.tar.bz2"
+	mirror://gentoo/${P}-patches-${PATCHV}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
diff --git a/app-crypt/mit-krb5/mit-krb5-1.7.ebuild b/app-crypt/mit-krb5/mit-krb5-1.7.ebuild
deleted file mode 100644
index f1799b6285d4..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.7.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2009 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.7.ebuild,v 1.1 2009/07/22 13:27:17 mueli Exp $
-
-inherit eutils flag-o-matic versionator
-
-PATCHV="0.6"
-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
-http://dev.gentoo.org/~mueli/kerberos/${P}-patches-${PATCHV}.tar.bz2"
-#	mirror://gentoo/${P}-patches-${PATCHV}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND="!virtual/krb5
-	>=sys-libs/e2fsprogs-libs-1.41.0"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-S=${WORKDIR}/${MY_P}/src
-
-PROVIDE="virtual/krb5"
-
-src_unpack() {
-	unpack ${A}
-	unpack ./${MY_P}.tar.gz
-	cd "${S}"
-	EPATCH_SUFFIX="patch" epatch "${PATCHDIR}"
-	einfo "Regenerating configure scripts (be patient)"
-	./util/reconf --force
-}
-
-src_compile() {
-	append-flags "-I/usr/include/et"
-	econf \
-		--without-krb4 \
-		--enable-shared \
-		--with-system-et --with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-replay-cache || die
-	emake -j1 || die
-
-	if use doc ; then
-		cd ../doc
-		for dir in api implement ; do
-			make -C "${dir}" || die
-		done
-	fi
-}
-
-src_test() {
-	einfo "Tests do not run in sandbox, they need mit-krb5 to be already installed to test it."
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR=/usr/share/doc/${PF}/examples \
-		install || die
-
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc README
-	dodoc doc/*.ps
-	doinfo doc/*.info*
-	dohtml -r doc/*
-
-	use doc && dodoc doc/{api,implement}/*.ps
-
-	for i in {telnetd,ftpd} ; do
-		mv "${D}"/usr/share/man/man8/${i}.8 "${D}"/usr/share/man/man8/k${i}.8
-		mv "${D}"/usr/sbin/${i} "${D}"/usr/sbin/k${i}
-	done
-
-	for i in {rcp,rlogin,rsh,telnet,ftp} ; do
-		mv "${D}"/usr/share/man/man1/${i}.1 "${D}"/usr/share/man/man1/k${i}.1
-		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/k${i}
-	done
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd mit-krb5kdc
-
-	insinto /etc
-	newins "${D}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	newins "${D}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-}