diff --git a/dev-libs/adminutil/Manifest b/dev-libs/adminutil/Manifest index 71fb5c4a..2ec3587d 100644 --- a/dev-libs/adminutil/Manifest +++ b/dev-libs/adminutil/Manifest @@ -7,10 +7,10 @@ MD5 5d44c98ba10f5626af3b82e099cd94f0 files/adminutil-cvs.sh 320 RMD160 132dfd104651cf7688b5334810ff96f3d3be4477 files/adminutil-cvs.sh 320 SHA256 d34cf024629eab1d74475634c826b41c5542818d5817a27c303463b15c5d399b files/adminutil-cvs.sh 320 DIST adminutil-1.1.4-20070807.tar.bz2 308728 RMD160 57fa91fe81988edc1e12d93af25ff3a4bea6855d SHA1 df7b7944178663d1adf836a8524d70e9255f98c0 SHA256 61a578a0f1d78ea66a9c6390a8e44d7ec2162703f19b44e3aa3553b25f3119e3 -EBUILD fedora-ds-adminutil-1.1.4.20070807.ebuild 1656 RMD160 ef48d540e1c75e53c0b51273a345cf8e2d8523ed SHA1 83f022d252d77cbab8cdcb36bd7a09df24d7b302 SHA256 f00579dc97e1dda9eb37140890b047d6db1f0968d651a7df6355730f74e64c38 -MD5 d7c743f14dd17f3fd0d2e8e01b7ad891 fedora-ds-adminutil-1.1.4.20070807.ebuild 1656 -RMD160 ef48d540e1c75e53c0b51273a345cf8e2d8523ed fedora-ds-adminutil-1.1.4.20070807.ebuild 1656 -SHA256 f00579dc97e1dda9eb37140890b047d6db1f0968d651a7df6355730f74e64c38 fedora-ds-adminutil-1.1.4.20070807.ebuild 1656 -MD5 6e1642e99f7cb45b3f70c4c95754589f files/digest-fedora-ds-adminutil-1.1.4.20070807 277 -RMD160 1a2471b6039d97adfaf5b1114a0f33de2a115aeb files/digest-fedora-ds-adminutil-1.1.4.20070807 277 -SHA256 09505500b4cad6b1760cce98a236fafcdc1be3059c357b9b010a5854a5f1588f files/digest-fedora-ds-adminutil-1.1.4.20070807 277 +EBUILD adminutil-1.1.4.20070807.ebuild 1652 RMD160 c997f0effe53e373e65a5a142f3152d63411feee SHA1 77df6932670264570af7cbdc6efc9493ce9be9fd SHA256 2a8f7fd8fa001133cceae0538e9639baf9d48f7c6560241784b205bca6e16ac5 +MD5 23f9ae1758f3b7ae82080dacd10c0d39 adminutil-1.1.4.20070807.ebuild 1652 +RMD160 c997f0effe53e373e65a5a142f3152d63411feee adminutil-1.1.4.20070807.ebuild 1652 +SHA256 2a8f7fd8fa001133cceae0538e9639baf9d48f7c6560241784b205bca6e16ac5 adminutil-1.1.4.20070807.ebuild 1652 +MD5 6e1642e99f7cb45b3f70c4c95754589f files/digest-adminutil-1.1.4.20070807 277 +RMD160 1a2471b6039d97adfaf5b1114a0f33de2a115aeb files/digest-adminutil-1.1.4.20070807 277 +SHA256 09505500b4cad6b1760cce98a236fafcdc1be3059c357b9b010a5854a5f1588f files/digest-adminutil-1.1.4.20070807 277 diff --git a/dev-libs/adminutil/fedora-ds-adminutil-1.1.4.20070807.ebuild b/dev-libs/adminutil/adminutil-1.1.4.20070807.ebuild similarity index 97% rename from dev-libs/adminutil/fedora-ds-adminutil-1.1.4.20070807.ebuild rename to dev-libs/adminutil/adminutil-1.1.4.20070807.ebuild index c6bc89ea..84c0434f 100644 --- a/dev-libs/adminutil/fedora-ds-adminutil-1.1.4.20070807.ebuild +++ b/dev-libs/adminutil/adminutil-1.1.4.20070807.ebuild @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="sasl ipv6 debug" -S="${WORKDIR}/adminutil-${MY_PV}" +S="${WORKDIR}/${PN}-${MY_PV}" DEPEND=">=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.6.4 diff --git a/dev-libs/adminutil/files/digest-fedora-ds-adminutil-1.1.4.20070807 b/dev-libs/adminutil/files/digest-adminutil-1.1.4.20070807 similarity index 100% rename from dev-libs/adminutil/files/digest-fedora-ds-adminutil-1.1.4.20070807 rename to dev-libs/adminutil/files/digest-adminutil-1.1.4.20070807 diff --git a/net-nds/fedora-ds-adminutil/Manifest b/net-nds/fedora-ds-adminutil/Manifest deleted file mode 100644 index 45ec1285..00000000 --- a/net-nds/fedora-ds-adminutil/Manifest +++ /dev/null @@ -1,12 +0,0 @@ -AUX adminutil-cvs.sh 320 RMD160 132dfd104651cf7688b5334810ff96f3d3be4477 SHA1 55ecc190c624f751cbf8a5fe67cf20f0bf266ef9 SHA256 d34cf024629eab1d74475634c826b41c5542818d5817a27c303463b15c5d399b -MD5 5d44c98ba10f5626af3b82e099cd94f0 files/adminutil-cvs.sh 320 -RMD160 132dfd104651cf7688b5334810ff96f3d3be4477 files/adminutil-cvs.sh 320 -SHA256 d34cf024629eab1d74475634c826b41c5542818d5817a27c303463b15c5d399b files/adminutil-cvs.sh 320 -DIST adminutil-1.1.4-20070807.tar.bz2 308728 RMD160 57fa91fe81988edc1e12d93af25ff3a4bea6855d SHA1 df7b7944178663d1adf836a8524d70e9255f98c0 SHA256 61a578a0f1d78ea66a9c6390a8e44d7ec2162703f19b44e3aa3553b25f3119e3 -EBUILD fedora-ds-adminutil-1.1.4.20070807.ebuild 1604 RMD160 461fa9093520db53ad260f0b0bde5409047036e6 SHA1 50c191d54c4916d4b137fa853635956f9123c13d SHA256 e975c69b9833bf88a25bb2c1659fbf5ee27e5447611fd32a973ef2b43a4d72c5 -MD5 52c29caa0f16690acb081f17fa460e7a fedora-ds-adminutil-1.1.4.20070807.ebuild 1604 -RMD160 461fa9093520db53ad260f0b0bde5409047036e6 fedora-ds-adminutil-1.1.4.20070807.ebuild 1604 -SHA256 e975c69b9833bf88a25bb2c1659fbf5ee27e5447611fd32a973ef2b43a4d72c5 fedora-ds-adminutil-1.1.4.20070807.ebuild 1604 -MD5 6e1642e99f7cb45b3f70c4c95754589f files/digest-fedora-ds-adminutil-1.1.4.20070807 277 -RMD160 1a2471b6039d97adfaf5b1114a0f33de2a115aeb files/digest-fedora-ds-adminutil-1.1.4.20070807 277 -SHA256 09505500b4cad6b1760cce98a236fafcdc1be3059c357b9b010a5854a5f1588f files/digest-fedora-ds-adminutil-1.1.4.20070807 277 diff --git a/net-nds/fedora-ds-adminutil/fedora-ds-adminutil-1.1.4.20070807.ebuild b/net-nds/fedora-ds-adminutil/fedora-ds-adminutil-1.1.4.20070807.ebuild deleted file mode 100644 index 5adb5f0f..00000000 --- a/net-nds/fedora-ds-adminutil/fedora-ds-adminutil-1.1.4.20070807.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils multilib versionator - -MY_PV=$(replace_version_separator 3 '-') - -DESCRIPTION="Fedora Directory Server (base)" -HOMEPAGE="http://directory.fedora.redhat.com/" -SRC_URI="ftp://mars.arge.at/fedora-ds/adminutil-${MY_PV}.tar.bz2" - -LICENSE="GPL-2-with-exceptions" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="sasl ipv6 debug" - -S="${WORKDIR}/adminutil-${MY_PV}" - -DEPEND=">=dev-libs/nss-3.11.4 - >=dev-libs/nspr-4.6.4 - >=dev-libs/svrcore-4.0.3 - >=dev-libs/mozldap-6.0.2 - sasl? ( >=dev-libs/cyrus-sasl-2.1.19 ) - >=dev-libs/icu-3.4" - -src_unpack() { - unpack ${A} -} - -src_compile() { - if use amd64 ; then - myconf="${myconf} --enable-64bit" - elif use sasl ; then - myconf="${myconf} --with-sasl=yes" - else - myconf="" - fi - - econf $(use_enable debug) \ - ${myconf} \ - --with-fhs \ - || die "econf failed" - emake || die "emake failed" - -# --with-nspr=yes \ -# --with-nss=yes \ -# --with-ldapsdk=yes \ -# --with-db=yes \ -# --with-svrcore=yes \ -# --with-icu=yes \ - -} - -src_install () { - emake DESTDIR=${D} install || die "emake failed" - - # remove redhat style init script -# rm -rf ${D}/etc/rc.d - - # cope with libraries being in /usr/lib/fedora-ds -# dodir /etc/env.d -# echo "LDPATH=/usr/$(get_libdir)/fedora-ds" > ${D}/etc/env.d/08fedora-ds - -} diff --git a/net-nds/fedora-ds-adminutil/files/adminutil-cvs.sh b/net-nds/fedora-ds-adminutil/files/adminutil-cvs.sh deleted file mode 100755 index dd448dd5..00000000 --- a/net-nds/fedora-ds-adminutil/files/adminutil-cvs.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -DATE=`date +%Y%m%d` -CVSTAG=HEAD -VERSION=1.1.4 -PKGNAME=adminutil -export CVSROOT=:pserver:anonymous@cvs.fedora.redhat.com:/cvs/dirsec - -cvs -d "$CVSROOT" -z3 export -r$CVSTAG -d $PKGNAME-$VERSION-$DATE adminutil - -tar -cjf $PKGNAME-$VERSION-$DATE.tar.bz2 $PKGNAME-$VERSION-$DATE - -rm -rf $PKGNAME-$VERSION-$DATE diff --git a/net-nds/fedora-ds-adminutil/files/digest-fedora-ds-adminutil-1.1.4.20070807 b/net-nds/fedora-ds-adminutil/files/digest-fedora-ds-adminutil-1.1.4.20070807 deleted file mode 100644 index 437c995c..00000000 --- a/net-nds/fedora-ds-adminutil/files/digest-fedora-ds-adminutil-1.1.4.20070807 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 22479358d513b102057169a6820fd9f8 adminutil-1.1.4-20070807.tar.bz2 308728 -RMD160 57fa91fe81988edc1e12d93af25ff3a4bea6855d adminutil-1.1.4-20070807.tar.bz2 308728 -SHA256 61a578a0f1d78ea66a9c6390a8e44d7ec2162703f19b44e3aa3553b25f3119e3 adminutil-1.1.4-20070807.tar.bz2 308728 diff --git a/net-nds/fedora-ds-base/Manifest b/net-nds/fedora-ds-base/Manifest index 39e9146e..42319062 100644 --- a/net-nds/fedora-ds-base/Manifest +++ b/net-nds/fedora-ds-base/Manifest @@ -11,10 +11,10 @@ MD5 8bb8765100c5ccc17793fe52d4262c91 files/fedora-ds.initd 2388 RMD160 a6cac204c39883ebbb22b41fa635d50387d00dae files/fedora-ds.initd 2388 SHA256 3098a6281d17b882f41174ecabecb45a6c67559ce7d439653559d8102e230c6e files/fedora-ds.initd 2388 DIST fedora-ds-1.1.0-20070807.tar.bz2 2766494 RMD160 1b9af290fc4f1e8284c07963a5288ca626e46d49 SHA1 eae2e7520d423723122f3e2efee1775a5f893f0a SHA256 3e2e5be7748b6258dcd6de175a25acd0883843763c930f8c14e7106973f0dcbc -EBUILD fedora-ds-base-1.1.0.20070807.ebuild 2030 RMD160 8254e9e4c85d558d73b635180e4f9e2cb0779185 SHA1 b5c7c5b4085f73225630cc4d3b54c65df8c4eabb SHA256 231922affae7ef0b54f69417e64fe207fb97a60f3f7a550b93ee463451a760cd -MD5 76e27da1e0ecee64cecccde8a89bfba1 fedora-ds-base-1.1.0.20070807.ebuild 2030 -RMD160 8254e9e4c85d558d73b635180e4f9e2cb0779185 fedora-ds-base-1.1.0.20070807.ebuild 2030 -SHA256 231922affae7ef0b54f69417e64fe207fb97a60f3f7a550b93ee463451a760cd fedora-ds-base-1.1.0.20070807.ebuild 2030 +EBUILD fedora-ds-base-1.1.0.20070807.ebuild 2281 RMD160 4bc82c877b8f8b6fcecfc322e1f51bb221f48338 SHA1 68ea2f523c8586ce59c24f7eaccb63079a6b0f92 SHA256 4eabf9b9301a71e01c9c1b77b9bb5385a8cd1aecea94756d8635e9d43b1345d0 +MD5 e3e07516abe8ddd6ef16dad3d03d48eb fedora-ds-base-1.1.0.20070807.ebuild 2281 +RMD160 4bc82c877b8f8b6fcecfc322e1f51bb221f48338 fedora-ds-base-1.1.0.20070807.ebuild 2281 +SHA256 4eabf9b9301a71e01c9c1b77b9bb5385a8cd1aecea94756d8635e9d43b1345d0 fedora-ds-base-1.1.0.20070807.ebuild 2281 MD5 adc03ba7e9e19b81279d1b4181cc57bf files/digest-fedora-ds-base-1.1.0.20070807 280 RMD160 f404f26dd26a1b7aea6ec24c16b62656b8fde0fc files/digest-fedora-ds-base-1.1.0.20070807 280 SHA256 6a482bd23798db1cde65627da530ae2e4dccabd5f9f62552113f526087f52640 files/digest-fedora-ds-base-1.1.0.20070807 280 diff --git a/net-nds/fedora-ds-base/fedora-ds-base-1.1.0.20070807.ebuild b/net-nds/fedora-ds-base/fedora-ds-base-1.1.0.20070807.ebuild index 70d8c45c..e7d145a4 100644 --- a/net-nds/fedora-ds-base/fedora-ds-base-1.1.0.20070807.ebuild +++ b/net-nds/fedora-ds-base/fedora-ds-base-1.1.0.20070807.ebuild @@ -65,6 +65,13 @@ src_compile() { src_install () { emake DESTDIR=${D} install || die "emake failed" + # install not installed header + insinto /usr/include/fedora-ds + doins ldap/servers/slapd/slapi-plugin.h + + # make sure perl scripts have a proper shebang + dosed 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' /usr/share/fedora-ds/script-templates/template-*.pl + # remove redhat style init script and install gentoo style rm -rf ${D}/etc/rc.d newinitd ${FILESDIR}/fedora-ds.initd fedora-ds