diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -1,9 +1,7 @@ AUX nss-3.11-config.patch 3167 RMD160 e4b57c89a518b54070b884f40ca11224ccc60349 SHA1 78acfa3c26bf5ca8f8d741f54c00bcf044d4c82b SHA256 0947675d067f09dee55684e29dc7764834ad640b2adf52d9450fbb1b7f9b728c AUX nss-3.12-config-1.patch 1508 RMD160 ea2f4e2f05cc865ef41af0c39e573b8eb8801f42 SHA1 4897595a91f331ce34155e9872ece3518acb1ac8 SHA256 22d72c155d7b6aa8f1dd797959d5ec3b0975cf9a1bf4607e6b0ee2207112c2b7 AUX nss-3.12-missingheader.patch 876 RMD160 4b1d2f888a6c243858ed48c157b7515fa5e66159 SHA1 5b9bd2b2170db9298667e937ff44c49e44d91b63 SHA256 e21218da77054614883cf23fb6b4dad53b7152aefe1ef8efbe5822d1828a6bc9 -AUX nss-3.12-missingheader.patch~ 846 RMD160 d2a3917f100baea8e71126ff125d61c08e8eee02 SHA1 d4ef2273b38bb298323d80af733b23ca5e0391fc SHA256 b9932fab9c31f27477812eed0febaa5be3fc9785cb048a2eb24dc23a442d029f AUX nss-fbsd7.patch 638 RMD160 9c60b07a9f9b9a7482221f09042266c358d6cfcf SHA1 27036a161ff076fc8a9d459458d2a4adc38876ad SHA256 f471f04def6d4f1abd2062b582246a60a33b346576ad6e71c782fcfe317c8cc7 AUX nss-mips64.patch 508 RMD160 17e750805ec8e3e6f5989810b43522bea344f133 SHA1 dd127c2365ea13f5f5c3ec3f9d6d1991225e3565 SHA256 e50a8fcd0521b7722448b480ff672d49d6ca0dc6134d8df25ac63da1a83ab07b DIST nss-3.12.tar.gz 5163155 RMD160 a84f9fa11e9fdb1c13f6d9b804b6f37dac4ee0af SHA1 6b8e83c0931cfad161aae993d344687b67f317aa SHA256 d30a7470b82a73ed442525b365afaf00427204e3771edfeab05743acca97122b EBUILD nss-3.12.ebuild 4457 RMD160 4a10c8d39525708269a021df4f154383369e9616 SHA1 b5fd893171818b5e75d63a8dbc9b3f73d33125c7 SHA256 1a6df0c7bfd9856eedf697e14bc243bc2b54b1e6582e4c24964f06c3e0493b3b -MISC nss-3.12.ebuild~ 4421 RMD160 98f0771f26afd8a0756052d4c854c292fe8c4813 SHA1 ce275467675f462af4c593fd7dae438965a7b095 SHA256 c5f4ae6375b8581f271ec29abbb87f1ec8ba30f9c47990014b2a3c63da8613a9 diff --git a/dev-libs/nss/files/nss-3.12-missingheader.patch~ b/dev-libs/nss/files/nss-3.12-missingheader.patch~ deleted file mode 100644 --- a/dev-libs/nss/files/nss-3.12-missingheader.patch~ +++ /dev/null @@ -1,15 +0,0 @@ -diff -c /var/tmp/portage/dev-libs/nss-3.12/work/nss-3.12/mozilla/security/nss/lib/pk11wrap/pk11pub.h /tmp/buffer-content-25351CEc -*** /var/tmp/portage/dev-libs/nss-3.12/work/nss-3.12/mozilla/security/nss/lib/pk11wrap/pk11pub.h 2008-03-10 16:16:46.000000000 -0400 ---- /tmp/buffer-content-25351CEc 2008-11-09 22:43:34.000000000 -0500 -*************** -*** 628,633 **** ---- 628,634 ---- - CERTCertList * PK11_ListCertsInSlot(PK11SlotInfo *slot); - CERTSignedCrl* PK11_ImportCRL(PK11SlotInfo * slot, SECItem *derCRL, char *url, - int type, void *wincx, PRInt32 importOptions, PRArenaPool* arena, PRInt32 decodeOptions); -+ PK11SlotList * PK11_GetAllSlotsForCert(CERTCertificate *c, void *arg); - - /********************************************************************** - * Sign/Verify - -Diff finished. Sun Nov 9 22:43:34 2008 diff --git a/dev-libs/nss/nss-3.12.ebuild~ b/dev-libs/nss/nss-3.12.ebuild~ deleted file mode 100644 --- a/dev-libs/nss/nss-3.12.ebuild~ +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.ebuild,v 1.3 2008/09/05 10:48:08 aballier Exp $ - -inherit eutils flag-o-matic multilib toolchain-funcs - -NSPR_VER="4.7.1" -RTM_NAME="NSS_${PV//./_}_RTM" -DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" -HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz" - -LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="utils" - -DEPEND=">=dev-libs/nspr-${NSPR_VER} - >=dev-db/sqlite-3.5.6" - -src_unpack() { - unpack ${A} - - cd "${S}"/mozilla/security/coreconf - # hack nspr paths - echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' \ - >> headers.mk || die "failed to append include" - - # cope with nspr being in /usr/$(get_libdir)/nspr - sed -e 's:$(DIST)/lib:/usr/'"$(get_libdir)"/nspr':' \ - -i location.mk - - # modify install path - sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ - -i source.mk - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk - - cd "${S}" - epatch "${FILESDIR}"/${PN}-3.11-config.patch - epatch "${FILESDIR}"/${PN}-3.12-config-1.patch - epatch "${FILESDIR}"/${PN}-mips64.patch - epatch "${FILESDIR}"/${PN}-fbsd7.patch -} - -src_compile() { - strip-flags - - echo > "${T}"/test.c - $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o - case $(file "${T}"/test.o) in - *64-bit*) export USE_64=1;; - *32-bit*) ;; - *) die "FAIL";; - esac - - export NSDISTMODE=copy - export NSS_USE_SYSTEM_SQLITE=1 - cd "${S}"/mozilla/security/coreconf - emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "coreconf make failed" - cd "${S}"/mozilla/security/dbm - emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "dbm make failed" - cd "${S}"/mozilla/security/nss - emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "nss make failed" -} - -src_install () { - MINOR_VERSION=12 - cd "${S}"/mozilla/security/dist - - # put all *.a files in /usr/lib/nss (because some have conflicting names - # with existing libraries) - dodir /usr/$(get_libdir)/nss - cp -L */lib/*.so "${D}"/usr/$(get_libdir)/nss || die "copying shared libs failed" - cp -L */lib/*.chk "${D}"/usr/$(get_libdir)/nss || die "copying chk files failed" - cp -L */lib/*.a "${D}"/usr/$(get_libdir)/nss || die "copying libs failed" - - # all the include files - insinto /usr/include/nss - doins private/nss/*.h - doins public/nss/*.h - cd "${D}"/usr/$(get_libdir)/nss - for file in *.so; do - mv ${file} ${file}.${MINOR_VERSION} - ln -s ${file}.${MINOR_VERSION} ${file} - done - - # coping with nss being in a different path. We move up priority to - # ensure that nss/nspr are used specifically before searching elsewhere. - dodir /etc/env.d - echo "LDPATH=/usr/$(get_libdir)/nss" > "${D}"/etc/env.d/08nss - - dodir /usr/bin - dodir /usr/$(get_libdir)/pkgconfig - cp "${FILESDIR}"/3.12-nss-config.in "${D}"/usr/bin/nss-config - cp "${FILESDIR}"/3.12-nss.pc.in "${D}"/usr/$(get_libdir)/pkgconfig/nss.pc - NSS_VMAJOR=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'` - NSS_VMINOR=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'` - NSS_VPATCH=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'` - - sed -e "s,@libdir@,/usr/"$(get_libdir)"/nss,g" \ - -e "s,@prefix@,/usr,g" \ - -e "s,@exec_prefix@,\$\{prefix},g" \ - -e "s,@includedir@,\$\{prefix}/include/nss,g" \ - -e "s,@MOD_MAJOR_VERSION@,$NSS_VMAJOR,g" \ - -e "s,@MOD_MINOR_VERSION@,$NSS_VMINOR,g" \ - -e "s,@MOD_PATCH_VERSION@,$NSS_VPATCH,g" \ - -i "${D}"/usr/bin/nss-config - chmod 755 "${D}"/usr/bin/nss-config - - sed -e "s,@libdir@,/usr/"$(get_libdir)"/nss,g" \ - -e "s,@prefix@,/usr,g" \ - -e "s,@exec_prefix@,\$\{prefix},g" \ - -e "s,@includedir@,\$\{prefix}/include/nss," \ - -e "s,@NSPR_VERSION@,`nspr-config --version`,g" \ - -e "s,@NSS_VERSION@,$NSS_VMAJOR.$NSS_VMINOR.$NSS_VPATCH,g" \ - -i "${D}"/usr/$(get_libdir)/pkgconfig/nss.pc - chmod 644 "${D}"/usr/$(get_libdir)/pkgconfig/nss.pc - - if use utils; then - cd "${S}"/mozilla/security/dist/*/bin/ - for f in *; do - newbin ${f} nss${f} - done - fi -} diff --git a/dev-util/mercurial/Manifest b/dev-util/mercurial/Manifest --- a/dev-util/mercurial/Manifest +++ b/dev-util/mercurial/Manifest @@ -1,5 +1,4 @@ AUX 70mercurial-gentoo.el 76 RMD160 1891ab510adb464211b4cc35c5b6e4b149da79fa SHA1 72eb35d2bf86fa8f806acfbc823b88fc5188741b SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d744128179be3142d9cd53a5ab AUX mercurial-1.0.2-wsgi.patch 516 RMD160 405d97ed307e497223959e9d6b2fd3f20850d8b5 SHA1 02efa27299895a36bfeced164eb22495bdbc8586 SHA256 e1dd9fc4d774564ddb111cffd4ca3f60610da7ab491ad373bb925b62e1557ce7 -AUX mercurial-1.0.2-wsgi.patch~ 558 RMD160 2c7c09cd68fe1429b53d061265e5fd90c9d56375 SHA1 5682cc2d1a2763a463064d7a24c5f7a3d7d5a23c SHA256 e3e228a85090872c04273862b90adb01f49b3beca7221668cdd7712815cb5452 DIST mercurial-1.0.2.tar.gz 815530 RMD160 0f163d19a12bbe7dcfc45f10cdab07f5b16e7b3a SHA1 6d5be655276770192b889cee279bdcc0aee977e3 SHA256 f96d985c04b57848cc142c206a22c2118941ff81e660824c29a859b5a652423a EBUILD mercurial-1.0.2.ebuild 3315 RMD160 d862fcefc809f3c25224fe5d4d437ab8c259ef20 SHA1 d593f25ab77ee799b7bc07a801ab11b844a378f5 SHA256 52df7ce8ccd3ef66927efbc2771902c557ec799a1b43318b3f02fb5bfcbff4f2 diff --git a/dev-util/mercurial/files/mercurial-1.0.2-wsgi.patch~ b/dev-util/mercurial/files/mercurial-1.0.2-wsgi.patch~ deleted file mode 100644 --- a/dev-util/mercurial/files/mercurial-1.0.2-wsgi.patch~ +++ /dev/null @@ -1,13 +0,0 @@ -diff -c /var/tmp/portage/dev-util/mercurial-1.0.2/work/mercurial-1.0.2/mercurial/ui.py /tmp/buffer-content-25351rxn ---- /var/tmp/portage/dev-util/mercurial-1.0.2/work/mercurial-1.0.2/mercurial/ui.py 2008-11-09 01:00:02.000000000 -0500 -+++ /tmp/buffer-content-25351rxn 2008-11-09 01:00:11.000000000 -0500 -@@ -394,6 +394,7 @@ - except IOError, inst: - if inst.errno != errno.EPIPE: - raise -+ except AttributeError, inst: - - def flush(self): - try: sys.stdout.flush() - -Diff finished. Sun Nov 9 01:00:11 2008 diff --git a/dev-util/scons/ChangeLog~ b/dev-util/scons/ChangeLog~ deleted file mode 100644 --- a/dev-util/scons/ChangeLog~ +++ /dev/null @@ -1,45 +0,0 @@ -# ChangeLog for dev-util/scons -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.64 2008/10/27 00:03:55 jer Exp $ - - 08 Nov 2008; Nathan Brink (not Gentoo dev) - ChangeLog: - Version bump according to Gentoo bug #242532. - - 27 Oct 2008; Jeroen Roovers scons-1.0.0.ebuild: - Stable for HPPA (bug #242766). - - 25 Oct 2008; nixnut scons-1.0.0.ebuild: - Stable on ppc wrt bug 242766 - - 21 Oct 2008; Raúl Porcel scons-1.0.0.ebuild: - alpha/ia64/sparc stable wrt #242766 - - 19 Oct 2008; Markus Meier scons-1.0.0.ebuild: - amd64/x86 stable, bug #242766 - -*scons-1.0.0 (19 Aug 2008) - - 19 Aug 2008; Jesus Rivero scons-0.97.ebuild, - -scons-0.98.3.ebuild, -scons-0.98.4.ebuild, -scons-0.98.5.ebuild, - +scons-1.0.0.ebuild: - Version bump. Removed old versions. Fixed 0.97 ebuild and this closes bug - #107013 - -*scons-0.98.5 (19 Jul 2008) - - 19 Jul 2008; Ali Polatel +scons-0.98.5.ebuild: - Version bump. - - 14 Jun 2008; Zac Medico scons-0.97.ebuild, - scons-0.98.3.ebuild, scons-0.98.4.ebuild: - Bug #226505 - For compatibity with phase execution order in - >=portage-2.1.5, call has_version inside pkg_preinst instead of - pkg_postinst. - -*scons-0.98.4 (29 May 2008) - - 29 May 2008; Ali Polatel -scons-0.96.1.ebuild, - -scons-0.96.94.ebuild, +scons-0.98.4.ebuild: - Version bump. Drop old. - diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest --- a/dev-util/scons/Manifest +++ b/dev-util/scons/Manifest @@ -1,5 +1,4 @@ DIST scons-1.1.0.tar.gz 558557 RMD160 c89fbe94484695b79256b89b76b9ba3030f029c9 SHA1 bb34a048e907f9a0c20f84ecc21a6ea0479fab99 SHA256 e041a4696392ea3eb06bf9e7ef1bd838882a4754003fe1d5bd650d2e2a7befb9 EBUILD scons-1.1.0.ebuild 1145 RMD160 ff9e6be7abb11262b2f08434efc7f03d4eb7a1f2 SHA1 ed628fb7f0a3894a5afc38d5d4e85f7f2bc02fa1 SHA256 1619839418c7b27df908eda170572190584eaab10378977cb947a166946219cf MISC ChangeLog 1578 RMD160 1791933aa3add91d826c4021319708b4681a3a69 SHA1 afd2d1e53895b6dd5999fa72c066c63cc0fd7b03 SHA256 6fddc6df9aa16eaf302d0b3e952743b0ef275ffffccc931d635877cacf799970 -MISC ChangeLog~ 1561 RMD160 8d1c7ed6332b6f4136a102dcaf12433a5d66c82a SHA1 a61687b8cb8965e94fba620b3385273d1e978559 SHA256 0928946b408370baba300da3677810750f41da68a2f7b21ca7ce7242e6266f20 MISC metadata.xml 259 RMD160 e07f81006af8091709da130bf7766960545d08b1 SHA1 d68efa412545d069a60b0e13c20b910a5680eeaa SHA256 d20eefe0b0976cc928c0e17b9e5ba6c670f30ebb49086955e6f6b335fbb597ef diff --git a/net-fs/samba-tng/Manifest b/net-fs/samba-tng/Manifest --- a/net-fs/samba-tng/Manifest +++ b/net-fs/samba-tng/Manifest @@ -9,4 +9,3 @@ AUX 0.4.99/07_all_CVE-2007-6015.diff 341 AUX 0.4.99/08_all_CVE-2007-2446-and-other.diff 6851 RMD160 fb25fc505a36479a70ba56b81a269e96890ad7c4 SHA1 9ad2ef42902ecd7d9f4ff2a1b5ba23d50f4e84e1 SHA256 21888e2354e55ecd471472ff513a817276319964c1036a485db6792f23a98644 DIST samba-tng-0.4.99.tar.gz 3336749 RMD160 1cd4f126229f0148c07de38335280fcb2ba0cf4b SHA1 dd753f9afed2245c69e7517145479027d1bba329 SHA256 b37c8b064812454374469e6b2ca243adb7c7d2f5d5abf18ba8bb68a86140c579 EBUILD samba-tng-0.4.99.ebuild 3704 RMD160 ea90f05463c282135364fffa983a37ef7941c7fe SHA1 0db135dcf147121b85d5ba0c14e26bc544e0f646 SHA256 4569a51f7492f69e5e4ccdb2fe6c2ac451a2de0590524db12ec2e81b88d277df -MISC samba-tng-0.4.99.ebuild~ 3722 RMD160 5096886aee30de22d2059e53db4f0186eafb06d7 SHA1 ee72697e67eed0867bf49f1a2397dd557dbeffd7 SHA256 6ea1fe5678498cbba40f0c0809c132d0b965273f1f7b974ec31f86324903bbec diff --git a/net-fs/samba-tng/samba-tng-0.4.99.ebuild~ b/net-fs/samba-tng/samba-tng-0.4.99.ebuild~ deleted file mode 100644 --- a/net-fs/samba-tng/samba-tng-0.4.99.ebuild~ +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ -# ebuild by Nathan Brink -# don't trust it -# most of the following junk is derived of /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.27.ebuild,v 1.11 and that is why I copied the header.txt file in also -# I need to get some smbspool program working... - -inherit eutils pam libtool - -SRC_URI="http://download.samba-tng.org/tng/${PV}/${P}.tar.gz" -SLOT="0" - -#following line assumed :-( -LICENSE="GPL-2" - -KEYWORDS="amd64 x86" - -DESCRIPTION="A fork of samba emphasizing features over stability" -HOMEPAGE="http://www.samba-tng.org/" - -#defaultedly use smbmount, defaultedly use --with-sam-pwdb=passdb, if nis will us nisplus-home, utempter activates utmp -IUSE="ldap msdfs afs dce-dfs krb4 kerberos automount pam nis syslog netatalk quotas utempter cups tcpwrapper" - -ALLDEPEND="virtual/libiconv - ldap? ( net-nds/openldap ) - krb4? ( virtual/krb4 ) - kerberos? ( virtual/krb5 ) - pam? ( virtual/pam ) - syslog? ( virtual/logger ) - netatalk? ( net-fs/netatalk ) - cups? ( net-print/cups ) - tcpwrappers? ( sys-apps/tcp-wrappers ) - " -RDEPEND="${ALLDEPEND} !net-fs/samba" -#we can still build a binary package for it even if we have samba installed :-) : -DEPEND="${ALLDEPEND} " - -PRIVATE_DST=/var/lib/samba-tng/private - -src_unpack() -{ - unpack ${A} - epatch "${FILESDIR}/${PV}" - cd "${S}/source" - emake clean proto all || die "unable to clean samba-tng" -} - -add_to_list() -{ - LIST=$1 - TOADD=$2 - if ! [ -z "${LIST}" ]; then - LIST="${LIST}," - fi - LIST="${LIST}${TOADD}" - return ${LIST} -} - -src_compile() -{ - cd "${S}/source" - - local WITH_PASSDB - local WITH_SAMPWDB - #local WITH_PASSDB_first - #WITH_PASSDB_first=0 - WITH_PASSDB="smbpass" - WITH_SAMPWDB="passdb,tdb" - if use nis; then - #WITH_PASSDB="nisplus" - #WITH_PASSDB_first=1 - #WITH_PASSDB=add_to_list "${WITH_PASSDB}" "nis,nisplus" - WITH_PASSDB="${PASSDB},nis,nisplus" - fi - if use ldap; then - #WITH_PASSDB=add_to_list "${WITH_PASSDB}" "ldap,nt5ldap" - WITH_PASSDB="${WITH_PASSDB},nt5ldap,ldap" - WITH_SMBPWDB="${WITH_SMBPWDB},nt5ldap" - fi - - - - - eautoreconf - - - econf \ - --program-suffix=-tng \ - --sysconfdir=/etc/samba-tng \ - --localstatedir=/var \ - --libdir=/usr/$(get_libdir)/samba-tng \ - --enable-shared=yes \ - --enable-static=no \ - --with-lockdir=/var/cache/samba-tng \ - --with-logdir=/var/log/samba-tng \ - --with-privatedir=${PRIVATE_DST} \ - --with-sambaconfdir=/etc/samba-tng \ - --without-spinlocks \ - $(use_with kernel_linux smbmount) \ - $(use_with ldap) \ - $(use_with msdfs) \ - --with-smbwrapper \ - $(use_with afs) \ - $(use_with dce-dfs) \ - $(use_with krb4) \ - $(use_with kerberos krb5) \ - $(use_with automount) \ - $(use_with pam) \ - $(use_with pam) \ - $(use_with nis) \ - --with-passdb=${WITH_PASSDB} \ - --with-sam-pwdb=${WITH_SMBPWDB} \ - $(use_with syslog) \ - $(use_with quotas) \ - $(use_with utempter utmp) \ - $(use_with cups) \ - $(use_with tcpwrappers) || die "econf failed" - - emake || die "emake failed" -} -src_install() -{ - cd "${S}/source" - emake install DESTDIR="${D}" || die "emake install failed" - - diropts -m0700 ; keepdir ${PRIVATE_DST} - - #pam_ntdom doesn't build (but the pam use flag makes a passdb backend for pam?) - if use pam ; then - #dopammod pam_ntdom/pam_ntdom.so #this will soon work ? - #newpamd (put an example file so that samba's passdb backend works?) - #no winbind support :-( use winbind && dopammod bin/pam_winbind.so - true; - fi -}