mark 0.69-r1 stable; fix 0.69 to compile with gcc-3.3

5 files changed, 18 insertions, 12 deletions

diff --git a/net-dialup/l2tpd/ChangeLog b/net-dialup/l2tpd/ChangeLog
index 64825239d39f..4e6b50b55f7e 100644
--- a/net-dialup/l2tpd/ChangeLog
+++ b/net-dialup/l2tpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/l2tpd
-# Copyright 2003 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/l2tpd/ChangeLog,v 1.4 2003/12/09 14:53:20 lanius Exp $
+# Copyright 2003-2004 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/l2tpd/ChangeLog,v 1.5 2004/02/11 20:18:44 lanius Exp $
+
+  11 Feb 2004; Heinrich Wendel <lanius@gentoo.org> l2tpd-0.69-r1.ebuild,
+  l2tpd-0.69.ebuild:
+  mark 0.69-r1 stable; fix 0.69 to compile with gcc-3.3
 
 *l2tpd-0.69-r1 (09 Dec 2003)
 
diff --git a/net-dialup/l2tpd/Manifest b/net-dialup/l2tpd/Manifest
index b25da452914b..eb1fb215d245 100644
--- a/net-dialup/l2tpd/Manifest
+++ b/net-dialup/l2tpd/Manifest
@@ -1,7 +1,6 @@
 MD5 7cdd9a2c694870e6fd22a0730163d6ba l2tpd-0.69-r1.ebuild 1810
-MD5 042ed627bba801f51ef5ee905aa2131e l2tpd-0.69.ebuild 1563
+MD5 90e6ce0735524426c3e7ed04a888af06 l2tpd-0.69.ebuild 1660
 MD5 7bd4ed19adca94aac505d08e67103216 ChangeLog 791
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 8fac6f64a3fa92ee4046a60f1c09dc66 files/digest-l2tpd-0.69-r1 67
-MD5 d6a701a4f443b06067841f3f72714b00 files/digest-l2tpd-0.69 131
+MD5 0a7a25480329c8228d50acee1917b683 files/digest-l2tpd-0.69 133
 MD5 daabc665d740579405c1922c734392ee files/l2tpd-init 383
diff --git a/net-dialup/l2tpd/files/digest-l2tpd-0.69 b/net-dialup/l2tpd/files/digest-l2tpd-0.69
index 93c48b7b8412..5697792addd2 100644
--- a/net-dialup/l2tpd/files/digest-l2tpd-0.69
+++ b/net-dialup/l2tpd/files/digest-l2tpd-0.69
@@ -1,2 +1,2 @@
 MD5 c5dba6b80f583070fe9e6ed6e0c2162e l2tpd-0.69.tar.gz 127693
-MD5 d41902cd6965d8789fdde67c9232f4d9 freeswanl2tpconfig-1.1.tgz 1943
+MD5 0df73df624eb01307c2edff00f52b1d1 l2tpd-0.69-gcc-3.3.patch.gz 19123
diff --git a/net-dialup/l2tpd/l2tpd-0.69-r1.ebuild b/net-dialup/l2tpd/l2tpd-0.69-r1.ebuild
index 5fc18ce0281f..ef609a486e47 100644
--- a/net-dialup/l2tpd/l2tpd-0.69-r1.ebuild
+++ b/net-dialup/l2tpd/l2tpd-0.69-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/l2tpd/l2tpd-0.69-r1.ebuild,v 1.1 2003/12/09 14:53:20 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/l2tpd/l2tpd-0.69-r1.ebuild,v 1.2 2004/02/11 20:18:44 lanius Exp $
 
 DESCRIPTION="Layer 2 Tunnelling Protocol Daemon"
 HOMEPAGE="http://www.l2tpd.org/"
@@ -11,7 +11,7 @@ DEPEND="virtual/glibc
 	>=sys-apps/sed-4"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 SLOT="0"
 IUSE=""
 
diff --git a/net-dialup/l2tpd/l2tpd-0.69.ebuild b/net-dialup/l2tpd/l2tpd-0.69.ebuild
index a7575892aa4f..a9d613a8d13a 100644
--- a/net-dialup/l2tpd/l2tpd-0.69.ebuild
+++ b/net-dialup/l2tpd/l2tpd-0.69.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/l2tpd/l2tpd-0.69.ebuild,v 1.1 2003/11/17 19:54:29 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/l2tpd/l2tpd-0.69.ebuild,v 1.2 2004/02/11 20:18:44 lanius Exp $
 
 DESCRIPTION="Layer 2 Tunnelling Protocol Daemon"
 HOMEPAGE="http://www.l2tpd.org/"
-SRC_URI="http://www.l2tpd.org/downloads/${P}.tar.gz"
+SRC_URI="http://www.l2tpd.org/downloads/${P}.tar.gz
+	mirror://gentoo/${PN}-${PV}-gcc-3.3.patch.gz"
 #	http://www.jacco2.dds.nl/networking/freeswanl2tpconfig-1.1.tgz"
 DEPEND="virtual/glibc"
 LICENSE="GPL-2"
@@ -16,6 +17,8 @@ src_unpack() {
 	unpack ${A} || die
 	cd ${S} || die
 
+	epatch ${DISTDIR}/${PN}-${PV}-gcc-3.3.patch.gz
+
 	#compile optimized
 	cp Makefile Makefile.orig
 	sed -e "s|-g -O2|${CFLAGS}|" Makefile.orig >Makefile