bump revision of samba patch to avoid digest mismatches

8 files changed, 23 insertions, 121 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 4d7938c8e292..2245258a0302 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/mc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
 
+  12 May 2004; Heinrich Wendel <lanius@gentoo.org> mc-4.6.0-r3.ebuild,
+  mc-4.6.0-r4.ebuild, mc-4.6.0-r5.ebuild, mc-4.6.0-r6.ebuild,
+  mc-4.6.0-r7.ebuild:
+  bump revision of samba patch to avoid digest mismatches
+
   10 May 2004; Luca Barbato <lu_zero@gentoo.org> mc-4.6.0-r7.ebuild:
   Marked ppc
 
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index f319d33c5486..a71cb5f0c4bb 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,16 +1,14 @@
-MD5 9f528fa7b6b4d2c202ce5f4e3a5173ba files/chdir-4.6.0.gentoo 159
+MD5 9d5874fc54546772bb7d727a5d1bc672 mc-4.5.55-r7.ebuild 2003
+MD5 9d46ddd853ce90e93bd0af9b50818311 mc-4.6.0-r7.ebuild 2678
+MD5 5734d3526bfefb601a31e5af10731c11 ChangeLog 7029
+MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
+MD5 e9700017c13ab27f9c3896bfe31973bf mc-4.6.0-r5.ebuild 2580
 MD5 d8853d9a555c715676945a15c98030c1 files/digest-mc-4.5.55-r7 125
-MD5 9da9bc02f7f8d9df473f36f2734feec8 files/digest-mc-4.6.0-r6 211
-MD5 4df4331a2db0f5e9c0f2c0c9bb683fc3 files/mc-4.6.0-vfs.patch 336
-MD5 9da9bc02f7f8d9df473f36f2734feec8 files/digest-mc-4.6.0-r7 211
 MD5 169bb0ff53b2a9c5271503bbcbccf3df files/mc-4.6.0-find.patch 5798
+MD5 4df4331a2db0f5e9c0f2c0c9bb683fc3 files/mc-4.6.0-vfs.patch 336
+MD5 23a5069637af088015fe5f0de8c42883 files/mc-4.6.0-can-2004-0226-0231-0232.patch.bz2 20610
 MD5 835695dda387b59a2497658f3f5af1d5 files/mc.gentoo 322
-MD5 9da9bc02f7f8d9df473f36f2734feec8 files/digest-mc-4.6.0-r5 211
+MD5 9f528fa7b6b4d2c202ce5f4e3a5173ba files/chdir-4.6.0.gentoo 159
 MD5 2a6c3ed30597eadaa19a6dbdd3ce168d files/mc-4.6.0-cpan-2003-1023.patch 475
-MD5 23a5069637af088015fe5f0de8c42883 files/mc-4.6.0-can-2004-0226-0231-0232.patch.bz2 20610
-MD5 5734d3526bfefb601a31e5af10731c11 ChangeLog 7029
-MD5 9d5874fc54546772bb7d727a5d1bc672 mc-4.5.55-r7.ebuild 2003
-MD5 da2d2c7d0a8416db9d9c63edd3ea9c2f mc-4.6.0-r6.ebuild 2616
-MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
-MD5 650c8f21cfa99d0d82c5b8fa33a9d2bc mc-4.6.0-r7.ebuild 2672
-MD5 446e1909ad31451b0188a05dd5d73296 mc-4.6.0-r5.ebuild 2574
+MD5 042fefdf0b2c229a62b4e18200099389 files/digest-mc-4.6.0-r5 214
+MD5 042fefdf0b2c229a62b4e18200099389 files/digest-mc-4.6.0-r7 214
diff --git a/app-misc/mc/files/digest-mc-4.6.0-r5 b/app-misc/mc/files/digest-mc-4.6.0-r5
index 8c490e6fff01..82c87e399f3e 100644
--- a/app-misc/mc/files/digest-mc-4.6.0-r5
+++ b/app-misc/mc/files/digest-mc-4.6.0-r5
@@ -1,3 +1,3 @@
 MD5 70804dc9e2049e24f294ff7090a82a12 mc-4.6.0.tar.gz 3727676
-MD5 f5053361d1936b3e4187857daf0cc6cb mc-4.6.0-sambalib-3.0.0.patch.bz2 399920
+MD5 f5053361d1936b3e4187857daf0cc6cb mc-4.6.0-sambalib-3.0.0-r1.patch.bz2 399920
 MD5 3378ef7b8f4029f7aa4ee6944694cf1f mc-4.6.0-sambalib.patch.bz2 337051
diff --git a/app-misc/mc/files/digest-mc-4.6.0-r6 b/app-misc/mc/files/digest-mc-4.6.0-r6
deleted file mode 100644
index 8c490e6fff01..000000000000
--- a/app-misc/mc/files/digest-mc-4.6.0-r6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 70804dc9e2049e24f294ff7090a82a12 mc-4.6.0.tar.gz 3727676
-MD5 f5053361d1936b3e4187857daf0cc6cb mc-4.6.0-sambalib-3.0.0.patch.bz2 399920
-MD5 3378ef7b8f4029f7aa4ee6944694cf1f mc-4.6.0-sambalib.patch.bz2 337051
diff --git a/app-misc/mc/files/digest-mc-4.6.0-r7 b/app-misc/mc/files/digest-mc-4.6.0-r7
index 8c490e6fff01..82c87e399f3e 100644
--- a/app-misc/mc/files/digest-mc-4.6.0-r7
+++ b/app-misc/mc/files/digest-mc-4.6.0-r7
@@ -1,3 +1,3 @@
 MD5 70804dc9e2049e24f294ff7090a82a12 mc-4.6.0.tar.gz 3727676
-MD5 f5053361d1936b3e4187857daf0cc6cb mc-4.6.0-sambalib-3.0.0.patch.bz2 399920
+MD5 f5053361d1936b3e4187857daf0cc6cb mc-4.6.0-sambalib-3.0.0-r1.patch.bz2 399920
 MD5 3378ef7b8f4029f7aa4ee6944694cf1f mc-4.6.0-sambalib.patch.bz2 337051
diff --git a/app-misc/mc/mc-4.6.0-r5.ebuild b/app-misc/mc/mc-4.6.0-r5.ebuild
index 051df0e46000..2afcfbb0221a 100644
--- a/app-misc/mc/mc-4.6.0-r5.ebuild
+++ b/app-misc/mc/mc-4.6.0-r5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r5.ebuild,v 1.3 2004/05/08 09:48:37 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r5.ebuild,v 1.4 2004/05/12 11:25:55 lanius Exp $
 
 inherit flag-o-matic eutils
 
 DESCRIPTION="GNU Midnight Commander cli-based file manager"
 HOMEPAGE="http://www.ibiblio.org/mc/"
 SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/managers/${PN}/${P}.tar.gz
-	http://www.spock.mga.com.pl/public/gentoo/${P}-sambalib-3.0.0.patch.bz2
+	http://www.spock.mga.com.pl/public/gentoo/${P}-sambalib-3.0.0-r1.patch.bz2
 	http://www.spock.mga.com.pl/public/gentoo/${P}-sambalib.patch.bz2"
 
 LICENSE="GPL-2"
@@ -29,7 +29,7 @@ src_unpack() {
 	cd ${S}
 
 	has_version '>=net-fs/samba-3.0.0' \
-		&& epatch ${DISTDIR}/${P}-sambalib-3.0.0.patch.bz2
+		&& epatch ${DISTDIR}/${P}-sambalib-3.0.0-r1.patch.bz2
 	has_version '<net-fs/samba-3.0.0' \
 		&& epatch ${DISTDIR}/${P}-sambalib.patch.bz2
 
diff --git a/app-misc/mc/mc-4.6.0-r6.ebuild b/app-misc/mc/mc-4.6.0-r6.ebuild
deleted file mode 100644
index 4423a66f27e2..000000000000
--- a/app-misc/mc/mc-4.6.0-r6.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r6.ebuild,v 1.2 2004/05/08 09:48:37 lanius Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="GNU Midnight Commander cli-based file manager"
-HOMEPAGE="http://www.ibiblio.org/mc/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/managers/${PN}/${P}.tar.gz
-	http://www.spock.mga.com.pl/public/gentoo/${P}-sambalib-3.0.0.patch.bz2
-	http://www.spock.mga.com.pl/public/gentoo/${P}-sambalib.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ia64 x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64"
-IUSE="gpm nls samba ncurses X slang"
-
-DEPEND=">=sys-fs/e2fsprogs-1.19
-	ncurses? ( >=sys-libs/ncurses-5.2-r5 )
-	=dev-libs/glib-2*
-	>=sys-libs/pam-0.72
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	slang? ( >=sys-libs/slang-1.4.2 )
-	samba? ( net-fs/samba )
-	X? ( virtual/x11 )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	has_version '>=net-fs/samba-3.0.0' \
-		&& epatch ${DISTDIR}/${P}-sambalib-3.0.0.patch.bz2
-	has_version '<net-fs/samba-3.0.0' \
-		&& epatch ${DISTDIR}/${P}-sambalib.patch.bz2
-
-	epatch ${FILESDIR}/${P}-find.patch
-	epatch ${FILESDIR}/${P}-cpan-2003-1023.patch
-	epatch ${FILESDIR}/${P}-vfs.patch
-}
-
-src_compile() {
-	filter-flags -malign-double
-
-	local myconf=""
-
-	if ! use slang && ! use ncurses ; then
-		myconf="${myconf} --with-screen=mcslang"
-	elif use ncurses && ! use slang ; then
-		myconf="${myconf} --with-screen=ncurses"
-	else
-		use slang && myconf="${myconf} --with-screen=slang"
-	fi
-
-	myconf="${myconf} `use_with gpm gpm-mouse`"
-
-	use nls \
-	    && myconf="${myconf} --with-included-gettext" \
-	    || myconf="${myconf} --disable-nls"
-
-	myconf="${myconf} `use_with X x`"
-
-	use samba \
-	    && myconf="${myconf} --with-samba --with-configdir=/etc/samba
-				--with-codepagedir=/var/lib/samba/codepages --with-privatedir=/etc/samba/private" \
-	    || myconf="${myconf} --without-samba"
-
-	econf \
-	    --with-vfs \
-	    --with-gnu-ld \
-	    --with-ext2undel \
-	    --with-edit \
-		--enable-charset \
-	    ${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	 cat ${FILESDIR}/chdir-4.6.0.gentoo >>\
-		 ${S}/lib/mc-wrapper.sh
-
-	einstall || die
-
-	dodoc ChangeLog AUTHORS MAINTAINERS FAQ INSTALL* NEWS README*
-
-	insinto /usr/share/mc
-	doins ${FILESDIR}/mc.gentoo
-}
-
-pkg_postinst() {
-	einfo "Add the following line to your ~/.bashrc to"
-	einfo "allow mc to chdir to its latest working dir at exit"
-	einfo ""
-	einfo "# Midnight Commander chdir enhancement"
-	einfo "if [ -f /usr/share/mc/mc.gentoo ]; then"
-	einfo "	. /usr/share/mc/mc.gentoo"
-	einfo "fi"
-}
diff --git a/app-misc/mc/mc-4.6.0-r7.ebuild b/app-misc/mc/mc-4.6.0-r7.ebuild
index de437b32c225..5786e2f4fdbe 100644
--- a/app-misc/mc/mc-4.6.0-r7.ebuild
+++ b/app-misc/mc/mc-4.6.0-r7.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r7.ebuild,v 1.4 2004/05/10 12:17:15 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r7.ebuild,v 1.5 2004/05/12 11:25:55 lanius Exp $
 
 inherit flag-o-matic eutils
 
 DESCRIPTION="GNU Midnight Commander cli-based file manager"
 HOMEPAGE="http://www.ibiblio.org/mc/"
 SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/managers/${PN}/${P}.tar.gz
-	http://www.spock.mga.com.pl/public/gentoo/${P}-sambalib-3.0.0.patch.bz2
+	http://www.spock.mga.com.pl/public/gentoo/${P}-sambalib-3.0.0-r1.patch.bz2
 	http://www.spock.mga.com.pl/public/gentoo/${P}-sambalib.patch.bz2"
 
 LICENSE="GPL-2"
@@ -29,7 +29,7 @@ src_unpack() {
 	cd ${S}
 
 	has_version '>=net-fs/samba-3.0.0' \
-		&& epatch ${DISTDIR}/${P}-sambalib-3.0.0.patch.bz2
+		&& epatch ${DISTDIR}/${P}-sambalib-3.0.0-r1.patch.bz2
 	has_version '<net-fs/samba-3.0.0' \
 		&& epatch ${DISTDIR}/${P}-sambalib.patch.bz2