fixed big #255385

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

3 files changed, 150 insertions, 2 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index 864419032fd5..0466cc923c0a 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.132 2009/01/24 12:18:21 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.133 2009/01/26 15:36:50 mueli Exp $
+
+*heimdal-1.2.1-r2 (26 Jan 2009)
+
+  26 Jan 2009; Michael Hammer <mueli@gentoo.org> +heimdal-1.2.1-r2.ebuild:
+  fixed collision described in bug #255385 in heimdal-1.2.1-r2 - removed
+  testing warning for heimdal, should be stable now
 
   24 Jan 2009; nixnut <nixnut@gentoo.org> heimdal-1.2.1-r1.ebuild:
   ppc stable #244707
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 9e2bc2a4185a..977bb56622a8 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -11,6 +11,7 @@ DIST heimdal-1.2.1.tar.gz 5234882 RMD160 055e858200e53108ac24760516ff9d58e4fee0d
 DIST heimdal-gentoo-patches-0.2.tar.bz2 5215 RMD160 f6b87d3caf8f156fdcf7c61542ea612cdcd42d9a SHA1 2282ea687e2cc215bf77a61b9badfb4a347b2792 SHA256 c4074b06760e28ac9a9bd5f1bc54dd86f1c104463384ca2f79918029995bb45a
 EBUILD heimdal-0.7.2-r3.ebuild 3589 RMD160 ce3b520d984e5db9c07bd9219c0000b6a1518fd7 SHA1 efbebe0173d07ff4ce11851f57ccfdbff1db67c1 SHA256 052bcf4eb4acc0435c777c79d9f0ff2d3b6a8a5981852da623cca3d90121f1f7
 EBUILD heimdal-1.2.1-r1.ebuild 4216 RMD160 07ccdd18f01ac600a3e1d8f5ce68d93617c991a5 SHA1 9fe01b0123ceb566827e10ff7dd366978a977a4c SHA256 4004d9c6eaa8aa4c5172ef881ee636a8e39d7cd40ebfc95d4967adf82013495b
+EBUILD heimdal-1.2.1-r2.ebuild 3930 RMD160 4afcdc474ef47f26a44baf9b8a99bceec7beafb1 SHA1 e929c4a60e025658a3ccbf9c597f8b8d9e4d5b5b SHA256 bd12952fd6325e07d64f9d514b99e3542aa5004a5ceb101c09b0a12972540f1c
 EBUILD heimdal-1.2.1.ebuild 4122 RMD160 066e5421047e74a1fdd17e8217a3c07baecbe27f SHA1 e1bf13534537fe5238ee5506904e2575de2b31e5 SHA256 4e3a184defcb4846d3deecb46dce332c860af5f2e8617fceef333191b2437593
-MISC ChangeLog 21605 RMD160 80d7c698cdc21233508ed6fc243ea5ec0066168f SHA1 a096f311da329ef2e9f31ceaaa95d6c1c0f6c3f7 SHA256 edc311e027b992f38d25fbb4064af38dac4e4b03e897541c919f194a2182c914
+MISC ChangeLog 21838 RMD160 c3eee5d6d4c3542de53e462599117274e8b4333b SHA1 fa1f92f296f579d83dd666a20127ab46d183064e SHA256 80f357ba1b46bfb7aeb2a6e8e183d76229e29e39640cbab6575a559067230cc5
 MISC metadata.xml 1086 RMD160 a5ee11683dbfe929a061ce2b4f1967ae61b86d5d SHA1 95cc60a2a78fb4cd71e336a9a05b47fdfa7d1715 SHA256 581e15be965c0fe6246010854acabb2fce21a7afdb9c669e46bacd5440514fec
diff --git a/app-crypt/heimdal/heimdal-1.2.1-r2.ebuild b/app-crypt/heimdal/heimdal-1.2.1-r2.ebuild
new file mode 100644
index 000000000000..31724a142733
--- /dev/null
+++ b/app-crypt/heimdal/heimdal-1.2.1-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.2.1-r2.ebuild,v 1.1 2009/01/26 15:36:50 mueli Exp $
+
+WANT_AUTOMAKE=latest
+WANT_AUTOCONF=latest
+
+inherit autotools libtool eutils virtualx toolchain-funcs flag-o-matic
+
+EAPI=1
+PATCHVER=0.2
+PATCH_P=${PN}-gentoo-patches-${PATCHVER}
+RESTRICT="test"
+
+DESCRIPTION="Kerberos 5 implementation from KTH"
+HOMEPAGE="http://www.h5l.org/"
+SRC_URI="http://www.h5l.org/dist/src/${P}.tar.gz
+	mirror://gentoo/${PATCH_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="afs +berkdb hdb-ldap ipv6 otp pkinit ssl threads X"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	berkdb? ( sys-libs/db )
+	!berkdb? ( sys-libs/gdbm )
+	>=dev-db/sqlite-3.5.7
+	|| ( ( >sys-libs/e2fsprogs-libs-1.40.11 ) ( sys-libs/com_err sys-libs/ss ) )
+	afs? ( net-fs/openafs )
+	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
+	!virtual/krb5"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-devel/autoconf-2.62"
+#	>=sys-devel/libtool-2.2"
+
+PROVIDE="virtual/krb5"
+
+GENTOODIR=${WORKDIR}/gentoo
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	EPATCH_SUFFIX="patch" epatch "${GENTOODIR}"/patches
+
+	epatch "${FILESDIR}"/${PN}-r23238-kb5_locl_h-wind_h.patch
+	epatch "${FILESDIR}"/${PN}-r23235-kb5-libwind_la.patch
+	epatch "${FILESDIR}"/${PN}-kdc-sans_pkinit.patch
+	epatch "${FILESDIR}"/${PN}-system_sqlite.patch
+	epatch "${FILESDIR}"/${PN}-symlinked-manpages.patch
+	epatch "${FILESDIR}"/${PN}-autoconf-ipv6-backport.patch
+
+	AT_M4DIR="cf" eautoreconf
+}
+
+src_compile() {
+	# needed to work with sys-libs/e2fsprogs-libs <- should be removed!!
+	append-flags "-I/usr/include/et"
+	econf \
+		$(use_with ipv6) \
+		$(use_enable berkdb berkeley-db) \
+		$(use_enable pkinit pk-init) \
+		$(use_with ssl openssl /usr) \
+		$(use_with X x) \
+		$(use_enable threads pthread-support) \
+		$(use_enable otp) \
+		$(use_enable afs afs-support) \
+		$(use_with hdb-ldap openldap /usr) \
+		--disable-osfc2 \
+		--enable-kcm \
+		--enable-shared \
+		--disable-netinfo \
+		--prefix=/usr \
+		--libexecdir=/usr/sbin || die "econf failed"
+
+	local ltversion=`libtool --version |grep 'GNU libtool' |sed -e's/^.*(GNU libtool) \([0-9]\+\.[0-9]\+\(\.[0-9]\+\)\+\) .*$/\1/'`
+	local ltmajor=`echo $ltversion |sed -e's/^\([0-9]\+\)\..*$/\1/'`
+	local ltminor=`echo $ltversion |sed -e's/^[0-9]\+\.\([0-9]\+\)\..*$/\1/'`
+	if [ $ltmajor -lt 2 ] || ( [ $ltmajor -eq 2 ] && [ $ltminor -lt 2 ] ); then
+		ewarn "Using old libtool with a quick hack."
+		sed -i -e's/ECHO=/echo=/' libtool
+	fi
+
+	emake || die "emake failed"
+}
+
+src_test() {
+	addpredict /proc/fs/openafs/afs_ioctl
+	addpredict /proc/fs/nnpfs/afs_ioctl
+
+	if use X ; then
+		KRB5_CONFIG="${S}"/krb5.conf Xmake check || die
+	else
+		KRB5_CONFIG="${S}"/krb5.conf make check || die
+	fi
+}
+
+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
+	mv "${D}"/usr/share/man/man3/{,k}editline.3
+
+	doinitd "${GENTOODIR}"/configs/heimdal-kdc
+	doinitd "${GENTOODIR}"/configs/heimdal-kadmind
+	doinitd "${GENTOODIR}"/configs/heimdal-kpasswdd
+	doinitd "${GENTOODIR}"/configs/heimdal-kcm
+
+	insinto /etc
+	newins "${GENTOODIR}"/configs/krb5.conf krb5.conf.example
+
+	sed -i "s:/lib:/$(get_libdir):" "${D}"/etc/krb5.conf.example || die "sed failed"
+
+	if use hdb-ldap; then
+		insinto /etc/openldap/schema
+		doins "${GENTOODIR}"/configs/krb5-kdc.schema
+	fi
+
+	# default database dir
+	keepdir /var/heimdal
+}