gcc3 (likely) related fix + clean-ups

4 files changed, 39 insertions, 31 deletions

diff --git a/dev-lang/sather/ChangeLog b/dev-lang/sather/ChangeLog
index fcaecd1015df..c315a5ded129 100644
--- a/dev-lang/sather/ChangeLog
+++ b/dev-lang/sather/ChangeLog
@@ -1,12 +1,16 @@
 # ChangeLog for dev-lang/sather
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/sather/ChangeLog,v 1.4 2003/02/12 05:57:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/sather/ChangeLog,v 1.5 2003/06/14 03:23:19 george Exp $
+
+  13 Jun 2003; George Shapovalov <george@gentoo.org> sather-1.3.ebuild, files/sather-1.3_gentoo.patch.gz :
+  applied fix from #21775 (most likely gcc-3 related borkage)
+  Thanks to Matze Braun <matze@braunis.de> for the report and fix
+  cleaned up (made ebuild use ${Px} constructs where necessary, added IUSE...)
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
 *sather-1.3 (19 Mar 2002)
 
-  19 Mar 2002; G.Bevin <gbevin@gentoo.org> sather-1.3.ebuild
-  files/sather-1.3:
+  19 Mar 2002; G.Bevin <gbevin@gentoo.org> sather-1.3.ebuild, files/sather-1.3:
   
   Initial package for the sather language.
diff --git a/dev-lang/sather/Manifest b/dev-lang/sather/Manifest
index bdc186c3b548..24f4f352ecdf 100644
--- a/dev-lang/sather/Manifest
+++ b/dev-lang/sather/Manifest
@@ -1,3 +1,4 @@
-MD5 ceeb566172a93d403396585b3eb316b3 ChangeLog 447
-MD5 0ae631f3698117f7071d3266352abbdc sather-1.3.ebuild 2612
+MD5 20d96bc65113e5f9db3f4164ce5b9752 sather-1.3.ebuild 2613
+MD5 93f2c8dfef31a5e29404d2e4d4c41c08 ChangeLog 761
 MD5 c33438632e63237679e1118825efbda3 files/digest-sather-1.3 498
+MD5 100d037660f42cb87c051e16f7e6cf08 files/sather-1.3_gentoo.patch.gz 1916
diff --git a/dev-lang/sather/files/sather-1.3_gentoo.patch.gz b/dev-lang/sather/files/sather-1.3_gentoo.patch.gz
new file mode 100644
index 000000000000..0780d9ad5bd8
--- /dev/null
+++ b/dev-lang/sather/files/sather-1.3_gentoo.patch.gz
diff --git a/dev-lang/sather/sather-1.3.ebuild b/dev-lang/sather/sather-1.3.ebuild
index f26388407d1a..739c81198de7 100644
--- a/dev-lang/sather/sather-1.3.ebuild
+++ b/dev-lang/sather/sather-1.3.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/sather/sather-1.3.ebuild,v 1.10 2003/02/13 10:29:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/sather/sather-1.3.ebuild,v 1.11 2003/06/14 03:23:19 george Exp $
+
+IUSE=""
 
 MY_P="Sather-${PV}"
 DESCRIPTION="Sather is an object oriented language designed to be simple, efficient, safe, flexible and non-proprietary."
-SRC_URI="http://www.cs.waikato.ac.nz/sather/release/downloads/${MY_P}.tar.gz
-	ftp://ftp.gnu.org/gnu/sather/Doc/sather-tutorial-000328.ps.gz
-	ftp://ftp.gnu.org/gnu/sather/Doc/sather-tutorial-000328.html.tar.gz
-	ftp://ftp.gnu.org/gnu/sather/Doc/sather-specification-000328.html.tar.gz
-	ftp://ftp.gnu.org/gnu/sather/Doc/sather-specification-000328.ps.gz
-	http://www.icsi.berkeley.edu/~sather/Publications/satish-thatte.ps.gz
-	http://www.icsi.berkeley.edu/~sather/Documentation/LanguageDescription/Descript.ps.gz"
+SRC_URI="http://www.cs.waikato.ac.nz/${PN}/release/downloads/${MY_P}.tar.gz
+	ftp://ftp.gnu.org/gnu/${PN}/Doc/${PN}-tutorial-000328.ps.gz
+	ftp://ftp.gnu.org/gnu/${PN}/Doc/${PN}-tutorial-000328.html.tar.gz
+	ftp://ftp.gnu.org/gnu/${PN}/Doc/${PN}-specification-000328.html.tar.gz
+	ftp://ftp.gnu.org/gnu/${PN}/Doc/${PN}-specification-000328.ps.gz
+	http://www.icsi.berkeley.edu/~${PN}/Publications/satish-thatte.ps.gz
+	http://www.icsi.berkeley.edu/~${PN}/Documentation/LanguageDescription/Descript.ps.gz"
 HOMEPAGE="http://www.cs.waikato.ac.nz/sather/ http://www.icsi.berkeley.edu/~sather/"
 
 SLOT="0"
@@ -24,14 +26,16 @@ RDEPEND=">=sys-devel/gcc-2.95.3-r5"
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
-	unpack Sather-1.3.tar.gz
+	unpack ${MY_P}.tar.gz
+
+	epatch ${FILESDIR}/${P}_gentoo.patch.gz
 
 	mkdir doc
 	cd doc
-	unpack sather-tutorial-000328.html.tar.gz
-	unpack sather-specification-000328.html.tar.gz
-	cp ${DISTDIR}/sather-tutorial-000328.ps.gz .
-	cp ${DISTDIR}/sather-specification-000328.ps.gz .
+	unpack ${PN}-tutorial-000328.html.tar.gz
+	unpack ${PN}-specification-000328.html.tar.gz
+	cp ${DISTDIR}/${PN}-tutorial-000328.ps.gz .
+	cp ${DISTDIR}/${PN}-specification-000328.ps.gz .
 	cp ${DISTDIR}/satish-thatte.ps.gz .
 	cp ${DISTDIR}/Descript.ps.gz .
 }
@@ -49,25 +53,24 @@ src_compile() {
 
 src_install () {
 	dodir /usr
-	cp -a ${WORKDIR}/Sather-1.3 ${D}/usr/sather
-	rm -rf ${D}/usr/sather/bin/sacomp.code
-	rm -rf ${D}/usr/sather/bin/sacomp-boot.code
-	rm -rf ${D}/usr/sather/sacomp
-	rm -rf ${D}/usr/sather/sacomp-boot
-	rm -rf ${D}/usr/sather/system
-	dodir /usr/sather/system
-	cp ${WORKDIR}/Sather-1.3/system/CONFIG ${D}/usr/sather/system
-	cp ${WORKDIR}/Sather-1.3/system/FORBID ${D}/usr/sather/system
-	
+	cp -a ${WORKDIR}/${MY_P} ${D}/usr/sather
+	rm -rf ${D}/usr/${PN}/bin/sacomp.code
+	rm -rf ${D}/usr/${PN}/bin/sacomp-boot.code
+	rm -rf ${D}/usr/${PN}/sacomp
+	rm -rf ${D}/usr/${PN}/sacomp-boot
+	rm -rf ${D}/usr/${PN}/system
+	dodir /usr/${PN}/system
+	cp ${WORKDIR}/${PN}-1.3/system/CONFIG ${D}/usr/${PN}/system
+	cp ${WORKDIR}/${PN}-1.3/system/FORBID ${D}/usr/${PN}/system
+
 	cd ${WORKDIR}
-	dodoc doc/sather-specification-000328.ps.gz doc/sather-tutorial-000328.ps.gz doc/satish-thatte.ps.gz doc/Descript.ps.gz
+	dodoc doc/${PN}-specification-000328.ps.gz doc/${PN}-tutorial-000328.ps.gz doc/satish-thatte.ps.gz doc/Descript.ps.gz
 	cp -a doc/specification.html ${D}/usr/share/doc/${P}
 	cp -a doc/tutorial.html ${D}/usr/share/doc/${P}
-	
+
 	dodir /etc/env.d
 cat >> ${D}/etc/env.d/05sather <<EOF
 SATHER_HOME="/usr/sather"
-LOCALE="en_NZ"
 SATHER_ENV="/usr/sather/resources/en_NZ/bin/LIBCHARS-posix"
 SATHER_RESOURCES="/usr/sather/resources/en_NZ"
 PATH="/usr/sather/bin"