Version bump and fix building with gcc-4 #141881 by Martin Mokrejs.

Package-Manager: portage-2.1.1_pre4

5 files changed, 116 insertions, 8 deletions

diff --git a/sys-fs/lde/ChangeLog b/sys-fs/lde/ChangeLog
index 2bc898362f57..aac0c387b159 100644
--- a/sys-fs/lde/ChangeLog
+++ b/sys-fs/lde/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/lde
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lde/ChangeLog,v 1.4 2004/06/24 22:51:46 agriffis Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lde/ChangeLog,v 1.5 2006/07/30 23:46:03 vapier Exp $
+
+*lde-2.6.1 (30 Jul 2006)
+
+  30 Jul 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/lde-2.6.1-no-shadowing.patch, +lde-2.6.1.ebuild:
+  Version bump and fix building with gcc-4 #141881 by Martin Mokrejs.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> lde-2.6.0.ebuild:
   Add inherit eutils
diff --git a/sys-fs/lde/Manifest b/sys-fs/lde/Manifest
index 366a0859b2dd..8d642ded5e4e 100644
--- a/sys-fs/lde/Manifest
+++ b/sys-fs/lde/Manifest
@@ -1,15 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 2c2d3e256bd0604abb3bd3c2f7c58d9c ChangeLog 605
+AUX 2.6.0-gcc3.patch 274 RMD160 0578c56bd19f24776bfae10f51e93eccbf1d909b SHA1 abf0b4361ba1a47bb944803a1ce31c1515b6d6f9 SHA256 9ff30394b35b0d018ad99980441c2c07e47d1b4da7023836d64051403542feb2
+MD5 5bed5e7b01d4a35898ba6ce2409b61a9 files/2.6.0-gcc3.patch 274
+RMD160 0578c56bd19f24776bfae10f51e93eccbf1d909b files/2.6.0-gcc3.patch 274
+SHA256 9ff30394b35b0d018ad99980441c2c07e47d1b4da7023836d64051403542feb2 files/2.6.0-gcc3.patch 274
+AUX lde-2.6.1-no-shadowing.patch 1296 RMD160 8e1e18d6616a68d8d73ba7274a965471662bf616 SHA1 984c452e42ed148475db614f81217d5edae23c66 SHA256 50496fe95c73cf4c188df7d93907ae30baad8ad590ea107f365edefdd9e74ba7
+MD5 2cfaddd47a4fabecd1cc0c9d5ad31703 files/lde-2.6.1-no-shadowing.patch 1296
+RMD160 8e1e18d6616a68d8d73ba7274a965471662bf616 files/lde-2.6.1-no-shadowing.patch 1296
+SHA256 50496fe95c73cf4c188df7d93907ae30baad8ad590ea107f365edefdd9e74ba7 files/lde-2.6.1-no-shadowing.patch 1296
+DIST lde-2.6.0.tar.gz 436665
+DIST lde-2.6.1.tar.gz 598050 RMD160 526297ce7698a8adba67d73d1e602d1db2aab371 SHA1 5ea5cdd698582a85710ac4bcb2411908c966d1cb SHA256 d987555145a05d7b8c9f65e3f0f9754da1c29cc9933597d1765117b7ef3b0694
+EBUILD lde-2.6.0.ebuild 703 RMD160 ce85a837a76238eb09e27155eca85cad65c54aeb SHA1 5f4d9378a915e23517bc471636d080a49aabae2a SHA256 16e3766a78ebb417e7e51cecdc8cd7177129508cfe8a45287c4954df3bd53682
 MD5 fabd4f972444c31756a4c68dee0408ed lde-2.6.0.ebuild 703
+RMD160 ce85a837a76238eb09e27155eca85cad65c54aeb lde-2.6.0.ebuild 703
+SHA256 16e3766a78ebb417e7e51cecdc8cd7177129508cfe8a45287c4954df3bd53682 lde-2.6.0.ebuild 703
+EBUILD lde-2.6.1.ebuild 693 RMD160 a5b72805bde72a45bf7777fc18a7cc2e15a6d6d4 SHA1 9ee0cc435932fc64a441639a335075bda77034b9 SHA256 52f49c27f2dbd4f88644bdbb71c3978098379b3dc5b878d57cb7f0243a9c5b1e
+MD5 0c35a2125329f6286de61bef4498d254 lde-2.6.1.ebuild 693
+RMD160 a5b72805bde72a45bf7777fc18a7cc2e15a6d6d4 lde-2.6.1.ebuild 693
+SHA256 52f49c27f2dbd4f88644bdbb71c3978098379b3dc5b878d57cb7f0243a9c5b1e lde-2.6.1.ebuild 693
+MISC ChangeLog 808 RMD160 e442ae2ca5980ff16a8fc0d81e0c6600b70ac57e SHA1 78992e69456b00c52eeab0c5b581d4d8c6a8dde0 SHA256 a3b4d1b3a5ec2d2573723b46fcc405d22945ac18b1baf4e461b972e0e2b3ed6f
+MD5 99973a4cda13fb3326520fc5ad213aed ChangeLog 808
+RMD160 e442ae2ca5980ff16a8fc0d81e0c6600b70ac57e ChangeLog 808
+SHA256 a3b4d1b3a5ec2d2573723b46fcc405d22945ac18b1baf4e461b972e0e2b3ed6f ChangeLog 808
+MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 5bed5e7b01d4a35898ba6ce2409b61a9 files/2.6.0-gcc3.patch 274
+RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
+SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
 MD5 8d920b3cfc487ce71ae2f5d46b5c5c7e files/digest-lde-2.6.0 61
+RMD160 f5e93ee38c455262fc80d0819b73996136ba4a2f files/digest-lde-2.6.0 61
+SHA256 f713c5a1e05ade17235697e2d7138f43e963e8706c06cae51773fc7df88f578e files/digest-lde-2.6.0 61
+MD5 461479ac24cc5c83a65a4e06119cc7ec files/digest-lde-2.6.1 229
+RMD160 0196995225fd17e6acd0f0dfcc038107240c6df8 files/digest-lde-2.6.1 229
+SHA256 e26052bc0cfc208372cde4b304b17c20a82d89172e67584045d386490446e16e files/digest-lde-2.6.1 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFA4vQ8HTu7gpaalycRAsfhAJ9pO/S0+8/JauIocd+Iy0OckF/TQQCgxW7w
-MRofm5xm2zrGwy3xURMsZCU=
-=R2kT
+iD8DBQFEzUTCamhnQswr0vIRAsE4AJ0V21hJthvYDtTcs5X153XHnyPKAACgr7sQ
+Q4u/ctANR6mrjomBUcJPZxc=
+=NYdb
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/lde/files/digest-lde-2.6.1 b/sys-fs/lde/files/digest-lde-2.6.1
new file mode 100644
index 000000000000..54af7619fca8
--- /dev/null
+++ b/sys-fs/lde/files/digest-lde-2.6.1
@@ -0,0 +1,3 @@
+MD5 7cd3a798cafc07d084db240fd1d1c830 lde-2.6.1.tar.gz 598050
+RMD160 526297ce7698a8adba67d73d1e602d1db2aab371 lde-2.6.1.tar.gz 598050
+SHA256 d987555145a05d7b8c9f65e3f0f9754da1c29cc9933597d1765117b7ef3b0694 lde-2.6.1.tar.gz 598050
diff --git a/sys-fs/lde/files/lde-2.6.1-no-shadowing.patch b/sys-fs/lde/files/lde-2.6.1-no-shadowing.patch
new file mode 100644
index 000000000000..586bbf3e8768
--- /dev/null
+++ b/sys-fs/lde/files/lde-2.6.1-no-shadowing.patch
@@ -0,0 +1,39 @@
+rename daylight to avoid shadowing the daylight function and pissing off gcc
+
+http://bugs.gentoo.org/141881
+
+--- lde/src/swiped/cnews/getdate.y
++++ lde/src/swiped/cnews/getdate.y
+@@ -24,7 +24,7 @@
+ 
+ 	static int timeflag, dateflag, dayflag, relflag;
+ 	static time_t relsec, relmonth;
+-	static int hh, mm, ss, merid, daylight;
++	static int hh, mm, ss, merid, foo_daylight;
+ 	static int dayord, dayreq;
+ 	static int month, day, year;
+ 	static int ourzone;
+@@ -68,19 +68,19 @@
+ 		{hh = $1; mm = $3; merid = $4;}
+ 	| NUMBER ':' NUMBER NUMBER 
+ 		{hh = $1; mm = $3; merid = 24;
+-		daylight = STANDARD; ourzone = $4%100 + 60*$4/100;}
++		foo_daylight = STANDARD; ourzone = $4%100 + 60*$4/100;}
+ 	| NUMBER ':' NUMBER ':' NUMBER 
+ 		{hh = $1; mm = $3; ss = $5; merid = 24;}
+ 	| NUMBER ':' NUMBER ':' NUMBER MERIDIAN 
+ 		{hh = $1; mm = $3; ss = $5; merid = $6;}
+ 	| NUMBER ':' NUMBER ':' NUMBER NUMBER 
+ 		{hh = $1; mm = $3; ss = $5; merid = 24;
+-		daylight = STANDARD; ourzone = $6%100 + 60*$6/100;};
++		foo_daylight = STANDARD; ourzone = $6%100 + 60*$6/100;};
+ 
+ zone:	ZONE 
+-		{ourzone = $1; daylight = STANDARD;}
++		{ourzone = $1; foo_daylight = STANDARD;}
+ 	| DAYZONE 
+-		{ourzone = $1; daylight = DAYLIGHT;};
++		{ourzone = $1; foo_daylight = DAYLIGHT;};
+ 
+ dyspec:	DAY 
+ 		{dayord = 1; dayreq = $1;}
diff --git a/sys-fs/lde/lde-2.6.1.ebuild b/sys-fs/lde/lde-2.6.1.ebuild
new file mode 100644
index 000000000000..77e5c084b9b8
--- /dev/null
+++ b/sys-fs/lde/lde-2.6.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lde/lde-2.6.1.ebuild,v 1.1 2006/07/30 23:46:03 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="ext2fs and minix disk editor for linux"
+HOMEPAGE="http://lde.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	dev-util/yacc"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-no-shadowing.patch #141881
+}
+
+src_install() {
+	into /
+	dosbin lde || die
+	newman doc/lde.man lde.8
+	dodoc WARNING README TODO
+}