fix for bug 28741, replaced perl calls with sed

3 files changed, 26 insertions, 15 deletions

diff --git a/dev-util/rhide/ChangeLog b/dev-util/rhide/ChangeLog
index 5871b5eae426..a4b24b5513ad 100644
--- a/dev-util/rhide/ChangeLog
+++ b/dev-util/rhide/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/rhide
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/ChangeLog,v 1.9 2003/05/09 23:19:33 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/ChangeLog,v 1.10 2003/09/20 10:17:25 genone Exp $
+
+  20 Sep 2003; Marius Mauch <genone@gentoo.org> rhide-1.5-r1.ebuild:
+  added a fix for gettext-0.12, thanks to Brandy (bug 28741). Also replacesd
+  the perl calls with sed, leaving the dependency for perl atm as I'm not sure
+  if it is needed for other things as well.
 
 *rhide-1.5-r1 (03 Apr 2003)
 
diff --git a/dev-util/rhide/Manifest b/dev-util/rhide/Manifest
index 047aec6de309..4629f32ff2f6 100644
--- a/dev-util/rhide/Manifest
+++ b/dev-util/rhide/Manifest
@@ -1,10 +1,10 @@
-MD5 ae5590764a11bbf17ec4c00bb91adc3e ChangeLog 1899
-MD5 4f217e1b022c84c04be429edb580e537 rhide-1.5-r1.ebuild 6686
 MD5 ff6b6d8fa1bca4bf4ffe5c3df48fa328 rhide-1.5.ebuild 6675
-MD5 c81b93769c56ac52fdc4b8a8b88a8c68 files/80rhide 27
+MD5 877961973a66d3e55fe5a14c47b1b66a rhide-1.5-r1.ebuild 6899
+MD5 802dfd8c3b7134bf61f9c0d41bff617f ChangeLog 2170
 MD5 5a96d86d3e84dac00c7042aaa9107ee7 files/tvrc 123
-MD5 5fc15112eb4dc31a46ef3e687d90279a files/digest-rhide-1.5 261
+MD5 e89c29aba20b5734aaa85e4156848a1d files/tvision-1.1.4-gcc31-filebuf.patch 5921
 MD5 5fc15112eb4dc31a46ef3e687d90279a files/digest-rhide-1.5-r1 261
+MD5 5fc15112eb4dc31a46ef3e687d90279a files/digest-rhide-1.5 261
 MD5 85d4b0e04b34c3c230795c9588ef044b files/rhide-1.5-rhtvision2.patch 3528
+MD5 c81b93769c56ac52fdc4b8a8b88a8c68 files/80rhide 27
 MD5 1db35a722b6c9793af40527e7a43c6f0 files/setedit-0.5.0-fix-includes.patch 493
-MD5 e89c29aba20b5734aaa85e4156848a1d files/tvision-1.1.4-gcc31-filebuf.patch 5921
diff --git a/dev-util/rhide/rhide-1.5-r1.ebuild b/dev-util/rhide/rhide-1.5-r1.ebuild
index 0ba863b77121..b764e3fcdc47 100644
--- a/dev-util/rhide/rhide-1.5-r1.ebuild
+++ b/dev-util/rhide/rhide-1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/rhide-1.5-r1.ebuild,v 1.5 2003/09/06 08:39:23 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/rhide-1.5-r1.ebuild,v 1.6 2003/09/20 10:17:25 genone Exp $
 
 #SNAPSHOT="20020825"
 TVISIONVER="2.0.1"
@@ -41,7 +41,8 @@ DEPEND="virtual/glibc
 	>=sys-libs/gpm-1.20.0
 	>=sys-libs/ncurses-5.2
 	aalib? ( media-libs/aalib )
-	X? ( virtual/x11 )"
+	X? ( virtual/x11 )
+	>=sys-apps/sed-4.0.7"
 
 src_unpack() {
 	unpack ${A}
@@ -53,16 +54,16 @@ src_unpack() {
 	# Update snapshot version
 	if [ -n "${SNAPSHOT}" ]
 	then
-		perl -pi -e "s|1998-11-29|${SNAPSHOT}|" ${S}/idemain.cc
+		sed -i -e "s|1998-11-29|${SNAPSHOT}|" ${S}/idemain.cc
 	else
-		perl -pi -e "s|1998-11-29|`date +%F`|" ${S}/idemain.cc
+		sed -i -e "s|1998-11-29|`date +%F`|" ${S}/idemain.cc
 	fi
 
 	cd ${S}
 	# Fix invalid "-O2" in CFLAGS and CXXFLAGS
 	for x in configure $(find . -name '*.mak') $(find . -name 'makefile.src')
 	do
-		[ -f "${x}" ] && perl -pi -e 's:-O2::g' ${x}
+		[ -f "${x}" ] && sed -i -e 's:-O2::g' ${x}
 	done
 
 	# Update setedit macro's
@@ -72,8 +73,13 @@ src_unpack() {
 	done
 
 	# Hack to uncomment a needed variable
-	perl -pi -e 's|//cmcUpdateCodePage|cmcUpdateCodePage|' \
+	sed -i -e 's|//cmcUpdateCodePage|cmcUpdateCodePage|' \
 		${WORKDIR}/${SETEDIT_S}/include/ced_coma.h
+
+	# fix codepage bug
+	has_version ">=sys-devel/gettext-0.12" && sed -i -e \
+		's:--add-location $(po_list_l):--add-location --from-code=iso-8859-1 $(po_list_l):' \
+		"${WORKDIR}/setedit/internac/gnumake.in"
 }
 
 src_compile() {
@@ -95,7 +101,7 @@ src_compile() {
 			--cxxflags='${DUMMYFLAGS}' || die
 
 		# Only build the static libs
-		perl -pi -e 's/all: static-lib dynamic-lib/all: static-lib/' Makefile
+		sed -i -e 's/all: static-lib dynamic-lib/all: static-lib/' Makefile
 
 		# -j breaks build
 		make || die
@@ -117,7 +123,7 @@ src_compile() {
 			`use_with aalib aa` || die
 
 		# Latest texinfo breaks docs, so disable for now ...
-		perl -pi -e 's/needed: internac doc-basic/needed: internac/' \
+		sed -i -e 's/needed: internac doc-basic/needed: internac/' \
 			Makefile
 
 		# -j breaks build
@@ -163,7 +169,7 @@ src_compile() {
 		if [ "${have_xfree}" = "Yes" ]
 		then
 			einfo "Compiling with XFree86 support..."
-			perl -pi -e 's|LDFLAGS= |LDFLAGS= -L/usr/X11R6/lib -lXmu|' \
+			sed -i -e 's|LDFLAGS= |LDFLAGS= -L/usr/X11R6/lib -lXmu|' \
 				${S}/config.env
 
 			touch ${WORKDIR}/.tvision-with-X11