Cleanups, DEPEND update

5 files changed, 48 insertions, 51 deletions

diff --git a/dev-util/rhide/files/digest-rhide-1.4.9 b/dev-util/rhide/files/digest-rhide-1.4.9
deleted file mode 100644
index e7fa517793fb..000000000000
--- a/dev-util/rhide/files/digest-rhide-1.4.9
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 9511b69b6b5a3b38c62ad207b3c94673 gdb-5.0.tar.gz 12300288
-MD5 a7a48298b60b0e9da62c447a2f08f30c rhide-1.4.9.tar.gz 864256
-MD5 3557caa365500399a586094dcee6a971 rhtvision-1.1.3b.src.tar.gz 770048
-MD5 90e90f330eb38c6f7a580be94d18b79d setedit-0.4.41.tar.gz 1114112
diff --git a/dev-util/rhide/files/digest-rhide-1.4.9-r1 b/dev-util/rhide/files/digest-rhide-1.4.9-r1
new file mode 100644
index 000000000000..099704691f88
--- /dev/null
+++ b/dev-util/rhide/files/digest-rhide-1.4.9-r1
@@ -0,0 +1,4 @@
+MD5 9511b69b6b5a3b38c62ad207b3c94673 gdb-5.0.tar.gz 12316672
+MD5 a7a48298b60b0e9da62c447a2f08f30c rhide-1.4.9.tar.gz 868352
+MD5 3557caa365500399a586094dcee6a971 rhtvision-1.1.3b.src.tar.gz 774144
+MD5 90e90f330eb38c6f7a580be94d18b79d setedit-0.4.41.tar.gz 1118208
diff --git a/dev-util/rhide/files/rhide-1.4.9.diff-2 b/dev-util/rhide/files/rhide-1.4.9-makefile.diff
index dcc5df3c2826..6fcd5279d2e3 100644
--- a/dev-util/rhide/files/rhide-1.4.9.diff-2
+++ b/dev-util/rhide/files/rhide-1.4.9-makefile.diff
@@ -1,3 +1,16 @@
+--- makefile.src.orig	Fri Oct 26 01:57:35 2001
++++ makefile.src	Fri Oct 26 01:57:46 2001
+@@ -191,8 +191,8 @@
+ 	   -o -name "$(name)") -print)

+ endif

+ 

+-mark.copyright: $(copyrite.exe)

+-	$(copyrite.exe) $(Markfiles)

++mark.copyright: $(copyrite_exe)

++	$(./copyrite_exe) $(Markfiles)

+ 

+ _languages.src: $(addsuffix .po,$(LANGUAGES))

+ 

 --- common.mak.orig	Mon Sep  3 12:36:41 2001
 +++ common.mak	Fri Oct 26 01:52:40 2001
 @@ -126,8 +126,8 @@
diff --git a/dev-util/rhide/files/rhide-1.4.9.diff-1 b/dev-util/rhide/files/rhide-1.4.9.diff-1
deleted file mode 100644
index 47832dd2fa5a..000000000000
--- a/dev-util/rhide/files/rhide-1.4.9.diff-1
+++ /dev/null
@@ -1,13 +0,0 @@
---- makefile.src.orig	Fri Oct 26 01:57:35 2001
-+++ makefile.src	Fri Oct 26 01:57:46 2001
-@@ -191,8 +191,8 @@
- 	   -o -name "$(name)") -print)

- endif

- 

--mark.copyright: $(copyrite.exe)

--	$(copyrite.exe) $(Markfiles)

-+mark.copyright: $(copyrite_exe)

-+	$(./copyrite_exe) $(Markfiles)

- 

- _languages.src: $(addsuffix .po,$(LANGUAGES))

- 

diff --git a/dev-util/rhide/rhide-1.4.9.ebuild b/dev-util/rhide/rhide-1.4.9-r1.ebuild
index ca84f844bce0..015fa343601b 100644
--- a/dev-util/rhide/rhide-1.4.9.ebuild
+++ b/dev-util/rhide/rhide-1.4.9-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer:  Desktop Team <desktop@cvs.gentoo.org>
 # Author:  Martin Schlemmer <azarah@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/rhide-1.4.9-r1.ebuild,v 1.1 2001/11/02 02:04:57 azarah Exp $
 
 TVISIONVER="1.1.3b"
 SETEDITVER="0.4.41"
@@ -10,16 +11,19 @@ GDBVER="5.0"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="RHIDE is a console IDE for various languages."
-SRC_URI="http://prdownloads.sourceforge.net/rhide/rhide-${PV}.tar.gz
-	 http://prdownloads.sourceforge.net/setedit/rhtvision-${TVISIONVER}.src.tar.gz
-	 http://prdownloads.sourceforge.net/setedit/setedit-${SETEDITVER}.tar.gz
+SRC_URI="http://download.sourceforge.net/rhide/rhide-${PV}.tar.gz
+	 http://download.sourceforge.net/setedit/rhtvision-${TVISIONVER}.src.tar.gz
+	 http://download.sourceforge.net/setedit/setedit-${SETEDITVER}.tar.gz
 	 ftp://ftp.gnu.org/gnu/gdb/gdb-${GDBVER}.tar.gz"
 HOMEPAGE="http://www.rhide.com/"
 
 # Ugly I know, but the build fails if teTeX not installed
 DEPEND="virtual/glibc
 	dev-libs/libpcre
+	sys-apps/texinfo
 	sys-devel/gettext
+	sys-libs/gpm
+	sys-libs/zlib
 	app-text/tetex"
 	
 
@@ -34,8 +38,7 @@ src_unpack() {
 	patch -p1 <${FILESDIR}/setedit-${SETEDITVER}.diff || die
 	
 	cd ${S}
-	patch <${FILESDIR}/rhide-1.4.9.diff-1 || die
-	patch <${FILESDIR}/rhide-1.4.9.diff-2 || die
+	patch <${FILESDIR}/rhide-1.4.9-makefile.diff || die
 }
 
 src_compile() {
@@ -45,7 +48,7 @@ src_compile() {
 	
 # ************* TVision *************
 	
-	cd ${S}/../tvision/
+	cd ${WORKDIR}/tvision/
 	
 	DUMMYFLAGS=""
 	
@@ -63,32 +66,32 @@ src_compile() {
 	make || die
 	
 	# Fix include problem
-	cp ${S}/../tvision/include/tv/* ${S}/../tvision/include
+	cp ${WORKDIR}/tvision/include/tv/* ${WORKDIR}/tvision/include
 		
 	
 # ************* SetEdit *************
 	
-	cd ${S}/../setedit/
+	cd ${WORKDIR}/setedit/
 	
 	./configure --prefix=/usr				\
 		--fhs						\
 		--libset || die
 	
 	# Fix CFLAGS and CXXFLAGS
-	cd ${S}/../setedit/makes
+	cd ${WORKDIR}/setedit/makes
 	cp rhide.env rhide.env.orig
 	sed -e "s:${CFLAGS}::g"					\
 		-e "s:${CXXFLAGS}::g" 				\
 		rhide.env.orig >rhide.env
 	make clean || die
 	make force-patch || die
-	cd ${S}/../setedit/
+	cd ${WORKDIR}/setedit/
 	
 	# -j breaks build
 	make || die
 
 	# Make the docs
-	cd ${S}/../setedit/doc
+	cd ${WORKDIR}/setedit/doc
 	make || die
 	
 	
@@ -96,15 +99,15 @@ src_compile() {
 	
 	cd ${S}
 	
-	# Fix CFLAGS and CXXFLAGS
+	# Fix CXXFLAGS
 	cp rhide.mak rhide.mak.orig
-	sed -e 's:-O2:$(CFLAGS):' rhide.mak.orig >rhide.mak
+	sed -e 's:-O2:$(CXXFLAGS):' rhide.mak.orig >rhide.mak
         cp rhide_.mak rhide_.mak.orig
-	sed -e 's:-O2:$(CFLAGS):' rhide_.mak.orig >rhide_.mak
+	sed -e 's:-O2:$(CXXFLAGS):' rhide_.mak.orig >rhide_.mak
 	cp gpr2mak.mak gpr2mak.mak.orig
-	sed -e 's:-O2:$(CFLAGS):' gpr2mak.mak.orig >gpr2mak.mak
+	sed -e 's:-O2:$(CXXFLAGS):' gpr2mak.mak.orig >gpr2mak.mak
 	cp gprexp.mak gprexp.mak.orig
-	sed -e 's:-O2:$(CFLAGS):' gprexp.mak.orig >gprexp.mak
+	sed -e 's:-O2:$(CXXFLAGS):' gprexp.mak.orig >gprexp.mak
 	
 	export RHIDESRC="`pwd`"
 	export SETSRC="${RHIDESRC}/../setedit"
@@ -112,32 +115,24 @@ src_compile() {
 	export TVSRC="${RHIDESRC}/../tvision"
 	export TVOBJ="${RHIDESRC}/../tvision/linux"
 	
+	# -j breaks build
 	make prefix=/usr			  		\
 		install_docdir=share/doc/${PF}			\
 		install_infodir=share/info			\
 		|| die
 	
-	# -j breaks build
-	make || die
-
-	# Update SetEdit and InfView's info pages
-	cp -f ${S}/../setedit/doc/editor.inf			\
-		${S}/share/setedit/setedit.inf
-	cp -f ${S}/../setedit/doc/infeng.inf			\
-		${S}/share/setedit/infview.inf
-
-	# Fix the filenames in the info pages
+	# Update and Fix DIR entry in .info files
 	cd ${S}/share/setedit/
-	cp setedit.inf setedit.inf.orig
 	sed -e 's:editor.inf:setedit.inf:g'			\
-		setedit.inf.orig > setedit.inf
-	cp infview.inf infview.inf.orig
-	sed -e 's:infeng.inf:infview.inf:g'			\
-		infview.inf.orig > infview.inf
-	cd ${S}
-	
+		${WORKDIR}/setedit/doc/editor.inf >		\
+		setedit.inf || die
+	sed -e	's:infeng.inf:infview.inf:g'			\
+		${WORKDIR}/setedit/doc/infeng.inf >             \
+		infview.inf || die
+        cd ${S}
+
 	# Update setedit macro's
-	cp -f ${S}/../setedit/cfgfiles/*.pmc ${S}/share/setedit
+	cp -f ${WORKDIR}/setedit/cfgfiles/*.pmc ${S}/share/setedit
 }
 
 src_install() {
@@ -152,6 +147,8 @@ src_install() {
 		mv ${file} ${file}o
 	done
 
+	doman ${WORKDIR}/setedit/doc/{infview.1,setedit.1}
+
 	# Install default CFG file and fix the paths
 	cd ${D}/usr/share/rhide
 	sed -e 's:/usr/local/share:/usr/share:g'		\