Version bump for 357235. Remove old.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 12 insertions, 156 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index 523fc5f8ff67..f161caf0c6e6 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.171 2011/03/02 10:46:16 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.172 2011/03/04 11:55:11 eras Exp $
+
+*heimdal-1.4.1_pre20110304 (04 Mar 2011)
+
+  04 Mar 2011; Eray Aslan <eras@gentoo.org>
+  -heimdal-1.4.1_pre20110216-r1.ebuild, -heimdal-1.4.1_pre20110301.ebuild,
+  +heimdal-1.4.1_pre20110304.ebuild:
+  Version bump for #357235. Remove old
 
 *heimdal-1.4.1_pre20110301 (02 Mar 2011)
 
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 1f692b53c770..21400ef11e1c 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -18,10 +18,8 @@ AUX heimdal_testsuite.patch 11928 RMD160 4e5f3277b07b8c0dd08d8518e381d9d21c29633
 AUX heimdal_testsuite_extra.patch 2352 RMD160 1f2dd032c995d672d376821060ea10684720c5ad SHA1 5537e1d96bc5509c987a2ea75df8dc3d3a5a1cb8 SHA256 301a27f3b36e00ca289d35c3554c4f03f1688e5e16a883b15a3d75180f9c8052
 AUX krb5.conf 424 RMD160 80a0159824b8a44698d97d911c701bb05f2f0688 SHA1 7602cc72576d144429cae5cf568feb25a5906ab7 SHA256 3acbae7a561b0a76c90ab53f41d5ffb5b811a39049c5ed15b1e7a34e8c889c6e
 DIST heimdal-1.3.3.tar.gz 5744155 RMD160 ce97ac415e7c27912ba148b81c46e756dc54ba3e SHA1 a385d959e3edd144aee79e9df585e44347342049 SHA256 8c8d2b272529c87ae9800825e2f266821b696ae6b56837edf0d19e17fc2a8630
-DIST heimdal-1.4.1_pre20110216.tar.bz2 10322710 RMD160 2ab82fa99d13dc91f8c28377b02ed40dd98d5ae5 SHA1 2fd61808398c956f152b809e50dc1d56781280f7 SHA256 e733e248479c36b1b9f7ce4e1cbc925efa05c514d40b44395e56932761e18cfc
-DIST heimdal-1.4.1_pre20110301.tar.bz2 10405129 RMD160 30e442f067a4a11826395e054ea086440f3ed4a4 SHA1 92f2a7251f3c05c6ea6dddf22e2e842402faf253 SHA256 6f2937d80d6b68cee10a60cef470d715314318149b2244f71c4e32a496662452
+DIST heimdal-1.4.1_pre20110304.tar.bz2 10404973 RMD160 ff0161ceb82e60925ac53fae1ad547b6993616fe SHA1 ffa6b04deb1fa3b22a094d31735342906e6bd982 SHA256 af120ed7c20d12275966682a49ffc5607a393f61c411a00ebac563614b241b38
 EBUILD heimdal-1.3.3-r1.ebuild 3136 RMD160 a77f4854f9cd988bad15a587af8fae3fc6e8de6a SHA1 7c5afecbdfcd43c8691fc4af0c7e33e0b5239ac5 SHA256 6984607ec24083cef23e8af14922516997d214885abccc32b42b0c9a2044b989
-EBUILD heimdal-1.4.1_pre20110216-r1.ebuild 4031 RMD160 304365f5f500bc702f9a4fd7c0408e6212c191b8 SHA1 1459ce6c7c6b0274c71e936daa81b5bc11497cc8 SHA256 8b904e9aa5fe8695c66b39b5b4b4bef21e2291d9b4308e94b649a0273afe4caf
-EBUILD heimdal-1.4.1_pre20110301.ebuild 3653 RMD160 7d66ea2e61fb330bc6371525b02226cf2fe5ac22 SHA1 bc2affde0c1f40415421bc68e746c9ce50de1784 SHA256 22b95f665b6355854bcf8d2adc27d539dbd4092e5f83c571b343b55e8052ebe3
-MISC ChangeLog 28278 RMD160 9a2987f287cd61f7480172849c942f116df35afa SHA1 09fff3dbbb46ebcf0dbd3af1e6866f39ee0cd248 SHA256 46d77cd722240e89482b437fe2a4dba6438b8b5fb83cc179c939086ad371c851
+EBUILD heimdal-1.4.1_pre20110304.ebuild 3653 RMD160 82466b85efa9aa99bef1801895a4d9959249e092 SHA1 9cb819f37b2e89c3cb62cc36de12f284a57118d1 SHA256 5b170959e1b0ed26b217609b49dc5ff42ae03c9d4cb1d6989f9d8526736d72db
+MISC ChangeLog 28516 RMD160 bc1771719c774c5548f49bb7ba89d3a7ccf7cd8f SHA1 16ba207ef03fc73b668ebc8e2f12c954c25c8f18 SHA256 62c07ec863db19defbef6f84296b29ec240b4cd90f74e93ab54abfe51f8dce1b
 MISC metadata.xml 469 RMD160 2dc8ebb842bdde2d766a1d35335d97581686cccc SHA1 f87ee646d52dc65e1c232b5ca15f7cfeef213304 SHA256 8d648750dfc00c8726d98166f672d9d35396cdad6f1ebed89e0ee4a29045abad
diff --git a/app-crypt/heimdal/heimdal-1.4.1_pre20110216-r1.ebuild b/app-crypt/heimdal/heimdal-1.4.1_pre20110216-r1.ebuild
deleted file mode 100644
index 9d866cfd377c..000000000000
--- a/app-crypt/heimdal/heimdal-1.4.1_pre20110216-r1.ebuild
+++ /dev/null
@@ -1,149 +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/heimdal/heimdal-1.4.1_pre20110216-r1.ebuild,v 1.2 2011/02/20 18:16:10 eras Exp $
-
-EAPI=2
-# PYTHON_BDEPEND="2"
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils libtool python toolchain-funcs virtualx
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl threads test X"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	berkdb? ( sys-libs/db )
-	!berkdb? ( sys-libs/gdbm )
-	caps? ( sys-libs/libcap-ng )
-	>=dev-db/sqlite-3.5.7
-	>=sys-libs/e2fsprogs-libs-1.41.11
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	!!app-crypt/mit-krb5"
-
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*
-	dev-util/pkgconfig
-	>=sys-devel/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-PROVIDE="virtual/krb5"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/heimdal_db5.patch"
-	epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
-	epatch "${FILESDIR}/heimdal_link_order.patch"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-	if use berkdb; then
-		myconf="--with-berkeley-db --with-berkeley-db-include=$(db_includedir)"
-	else
-		myconf="--without-berkeley-db"
-	fi
-	econf \
-		--enable-kcm \
-		--disable-osfc2 \
-		--enable-shared \
-		--with-libintl=/usr \
-		--with-readline=/usr \
-		--with-sqlite3=/usr \
-		--libexecdir=/usr/sbin \
-		$(use_enable afs afs-support) \
-		$(use_enable otp) \
-		$(use_enable pkinit kx509) \
-		$(use_enable pkinit pk-init) \
-		$(use_enable threads pthread-support) \
-		$(use_with caps capng) \
-		$(use_with hdb-ldap openldap /usr) \
-		$(use_with ipv6) \
-		$(use_with ssl openssl /usr) \
-		$(use_with X x) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_test() {
-	einfo "Disabled check-iprop which is known to fail.  Other tests should work."
-	default_src_test
-}
-
-src_install() {
-	INSTALL_CATPAGES="no" emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc ChangeLog README NEWS TODO
-
-	# Begin client rename and install
-	for i in {telnetd,ftpd,rshd,popper}
-	do
-		mv "${D}"/usr/share/man/man8/{,k}${i}.8
-		mv "${D}"/usr/sbin/{,k}${i}
-	done
-
-	for i in {rcp,rsh,telnet,ftp,su,login,pagsh,kf}
-	do
-		mv "${D}"/usr/share/man/man1/{,k}${i}.1
-		mv "${D}"/usr/bin/{,k}${i}
-	done
-
-	mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
-	mv "${D}"/usr/share/man/man5/{,k}login.access.5
-
-	newinitd "${FILESDIR}"/heimdal-kdc.initd-r1 heimdal-kdc
-	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r1 heimdal-kadmind
-	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r1 heimdal-kpasswdd
-	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
-	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
-	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
-	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
-	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
-	insinto /etc
-	newins "${FILESDIR}"/krb5.conf krb5.conf.example
-
-	if use hdb-ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/lib/hdb/hdb.schema"
-	fi
-
-	# default database dir
-	keepdir /var/heimdal
-}
-
-pkg_preinst() {
-	if has_version "=${CATEGORY}/${PN}-1.3.2*" ; then
-		if use hdb-ldap ; then
-			ewarn "Schema name changed to hdb.schema to follow upstream."
-			ewarn "Please check your slapd conf file to make sure"
-			ewarn "that the correct schema file is included."
-		fi
-	fi
-
-	if has_version "<=${CATEGORY}/${PN}-1.4.1_pre20110216"; then
-		ewarn "Unfortunately, libgssapi has functional changes but keeps the"
-		ewarn "same version number. Please run"
-		ewarn "\n		revdep-rebuild --library libgssapi.so.2\n"
-		ewarn "to avoid breaking your packages that depend on libgssapi.so"
-		ewarn "revdep-rebuild is part of app-portage/gentoolkit package."
-	fi
-}
diff --git a/app-crypt/heimdal/heimdal-1.4.1_pre20110301.ebuild b/app-crypt/heimdal/heimdal-1.4.1_pre20110304.ebuild
index 8dd53fcb6fc9..e35884ba4a56 100644
--- a/app-crypt/heimdal/heimdal-1.4.1_pre20110301.ebuild
+++ b/app-crypt/heimdal/heimdal-1.4.1_pre20110304.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.4.1_pre20110301.ebuild,v 1.1 2011/03/02 10:46:16 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.4.1_pre20110304.ebuild,v 1.1 2011/03/04 11:55:11 eras Exp $
 
 EAPI=2
 # PYTHON_BDEPEND="2"