Fixing repoman complaints.

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 3714da6ba4e7fb02bcedb8d859de4720f5719d37..f781fecd82af009d5f6cbde19c01ea30f8e90be5 100644 (file)
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,5 +1,5 @@
-MD5 f418d4249dd770496090b19ac4129a06 portage-2.0.49-r3.ebuild 9457
-MD5 a55daa51391355473232f275ea01c9a2 portage-2.0.48-r5.ebuild 8732
+MD5 ff2fee83fb5a424ac8de7b764b6c7aa9 portage-2.0.49-r3.ebuild 9495
+MD5 633311c3ccb9cb1b8484fa9fff805316 portage-2.0.48-r5.ebuild 8770
 MD5 d30ba0090f191de5923f6e46d2d6fa63 ChangeLog 417
 MD5 b6989b04bc0ab44de75cf82ab47698fa files/portage-rescue-2.0.48-r1-sparc.tbz2 227629
 MD5 7fd37ede0f97932165bc4465055d62ab files/digest-portage-2.0.48-r5 70

diff --git a/sys-apps/portage/portage-2.0.48-r5.ebuild b/sys-apps/portage/portage-2.0.48-r5.ebuild
index 3cd7f908745d2039aa1a17cbecf45eae6516c802..ff08bb3d29a1a687abb4d842e355e8b29c77af77 100644 (file)
--- a/sys-apps/portage/portage-2.0.48-r5.ebuild
+++ b/sys-apps/portage/portage-2.0.48-r5.ebuild
@@ -1,5 +1,6 @@
-# Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.48-r5.ebuild,v 1.2 2003/07/20 00:21:48 carpaski Exp $
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.48-r5.ebuild,v 1.3 2003/09/10 04:48:34 carpaski Exp $
 
 IUSE="build"
 
@@ -67,7 +68,7 @@ src_install() {
                ;;
        esac
        use build && [ -f /etc/make.conf ] && rm -f ${D}/etc/make.conf
-       
+
        doins etc-update.conf dispatch-conf.conf
        #python modules
        cd ${S}/src/python-missingos
@@ -85,7 +86,7 @@ src_install() {
        doexe *
        dosym emake /usr/lib/portage/bin/pmake
        doexe ${S}/src/tbz2tool
-       
+
        #install sandbox
        cd ${S}/src/sandbox-1.1
        make DESTDIR=${D} install || die
@@ -99,7 +100,7 @@ src_install() {
 
        dosym ../lib/portage/bin/etc-update /usr/sbin/etc-update
        dosym ../lib/portage/bin/fixpackages /usr/sbin/fixpackages
-       
+
        dosym ../lib/portage/bin/env-update /usr/sbin/env-update
        dosym ../lib/portage/bin/xpak /usr/bin/xpak
        dosym ../lib/portage/bin/repoman /usr/bin/repoman
@@ -113,15 +114,15 @@ src_install() {
        dosym ../lib/portage/bin/dispatch-conf /usr/sbin/dispatch-conf
 
        dosym newins /usr/lib/portage/bin/donewins
-       
+
        # man pages
        doman ${S}/man/*.[15]
-       
+
        # temp dir creation
        dodir /var/tmp
        chmod 1777 ${D}/var/tmp
        touch ${D}/var/tmp/.keep
-       
+
        #documentation
        dodoc ${S}/ChangeLog
 }
@@ -134,7 +135,7 @@ pkg_postinst() {
                cp /etc/ld.so.preload ${T}
                grep -v libsandbox ${T}/ld.so.preload > /etc/ld.so.preload
        fi
-       
+
        #remove possible previous sandbox files that could cause conflicts
        if [ -d /usr/lib/sandbox ]; then
                rm -f ${ROOT}/usr/lib/portage/bin/ebuild.sh.orig
@@ -142,7 +143,7 @@ pkg_postinst() {
                rm -f ${ROOT}/usr/bin/sandbox
                rm -rf ${ROOT}/usr/lib/sandbox
        fi
-       
+
        #yank old cache files
        if [ -d /var/cache/edb ]
        then
@@ -235,7 +236,7 @@ pkg_postinst() {
        rm -f ${ROOT}usr/lib/python2.2/site-packages/emergehelp.py[co]
        chmod 2775 ${ROOT}var/cache/edb/dep ${ROOT}var/cache/edb/dep/*
        chown -R root.wheel ${ROOT}var/cache/edb/dep
-       
+
        # we gotta re-compile these modules and deal with systems with clock skew (stale compiled files)
        python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/portage.py')" || die
        python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/portage.py')" || die

diff --git a/sys-apps/portage/portage-2.0.49-r3.ebuild b/sys-apps/portage/portage-2.0.49-r3.ebuild
index 32dcb190cc24c3d01b82e27dd4951c133e57b3e2..a00caee7c206d32d11ea94a347b0d629fe02436d 100644 (file)
--- a/sys-apps/portage/portage-2.0.49-r3.ebuild
+++ b/sys-apps/portage/portage-2.0.49-r3.ebuild
@@ -1,5 +1,6 @@
-# Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.49-r3.ebuild,v 1.1 2003/09/02 10:15:46 carpaski Exp $
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.49-r3.ebuild,v 1.2 2003/09/10 04:48:34 carpaski Exp $
 
 IUSE="build"
 
@@ -67,7 +68,7 @@ src_install() {
                ;;
        esac
        use build && [ -f /etc/make.conf ] && rm -f ${D}/etc/make.conf
-       
+
        doins etc-update.conf dispatch-conf.conf
        #python modules
        cd ${S}/src/python-missingos
@@ -85,7 +86,7 @@ src_install() {
        doexe *
        dosym emake /usr/lib/portage/bin/pmake
        doexe ${S}/src/tbz2tool
-       
+
        #install sandbox
        cd ${S}/src/sandbox-1.1
        make DESTDIR=${D} install || die
@@ -101,7 +102,7 @@ src_install() {
        dosym ../lib/portage/bin/dispatch-conf /usr/sbin/dispatch-conf
        dosym ../lib/portage/bin/archive-conf /usr/sbin/archive-conf
        dosym ../lib/portage/bin/fixpackages /usr/sbin/fixpackages
-       
+
        dosym ../lib/portage/bin/env-update /usr/sbin/env-update
        dosym ../lib/portage/bin/xpak /usr/bin/xpak
        dosym ../lib/portage/bin/repoman /usr/bin/repoman
@@ -114,15 +115,15 @@ src_install() {
        dosym ../lib/portage/bin/emerge-webrsync /usr/sbin/emerge-webrsync
 
        dosym newins /usr/lib/portage/bin/donewins
-       
+
        # man pages
        doman ${S}/man/*.[15]
-       
+
        # temp dir creation
        dodir /var/tmp
        chmod 1777 ${D}/var/tmp
        touch ${D}/var/tmp/.keep
-       
+
        #documentation
        dodoc ${S}/ChangeLog
 }
@@ -135,7 +136,7 @@ pkg_postinst() {
                cp /etc/ld.so.preload ${T}
                grep -v libsandbox ${T}/ld.so.preload > /etc/ld.so.preload
        fi
-       
+
        #remove possible previous sandbox files that could cause conflicts
        if [ -d /usr/lib/sandbox ]; then
                rm -f ${ROOT}/usr/lib/portage/bin/ebuild.sh.orig
@@ -143,7 +144,7 @@ pkg_postinst() {
                rm -f ${ROOT}/usr/bin/sandbox
                rm -rf ${ROOT}/usr/lib/sandbox
        fi
-       
+
        #yank old cache files
        if [ -d /var/cache/edb ]
        then
@@ -237,7 +238,7 @@ pkg_postinst() {
        rm -f ${ROOT}usr/lib/python2.2/site-packages/dispatch_conf.py[co]
        chmod 2775 ${ROOT}var/cache/edb/dep ${ROOT}var/cache/edb/dep/*
        chown -R root.wheel ${ROOT}var/cache/edb/dep
-       
+
        # we gotta re-compile these modules and deal with systems with clock skew (stale compiled files)
        python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/portage.py')" || die
        python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/portage.py')" || die