update setedit tarball to release

7 files changed, 307 insertions, 224 deletions

diff --git a/dev-util/rhide/ChangeLog b/dev-util/rhide/ChangeLog
index 861a7df52f2d..edac97ce56ff 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.6 2003/03/22 21:52:54 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/ChangeLog,v 1.7 2003/04/03 19:07:18 azarah Exp $
+
+*rhide-1.5-r1 (03 Apr 2003)
+
+  03 Apr 2003; Martin Schlemmer <azarah@gentoo.org> rhide-1.5-r1 :
+  Update setedit sources to the official released ones.
 
 *rhide-1.5 (22 Mar 2003)
 
diff --git a/dev-util/rhide/files/digest-rhide-1.5-r1 b/dev-util/rhide/files/digest-rhide-1.5-r1
new file mode 100644
index 000000000000..3ce00692bd86
--- /dev/null
+++ b/dev-util/rhide/files/digest-rhide-1.5-r1
@@ -0,0 +1,4 @@
+MD5 e9a197c729ea80a429bd9aa8107db666 rhide-1.5.tar.gz 959140
+MD5 409c52e8ec111a10f40b41a7fd198766 rhtvision-2.0.1.src.tar.gz 1168371
+MD5 0973c4b7a8febdc7fdb9551ebcaa2259 setedit-0.5.0.tar.gz 1710181
+MD5 70e4ade69a2dff2c7b9af9a4ef44798f gdb-5.3.tar.bz2 11198721
diff --git a/dev-util/rhide/files/digest-rhide-1.5_pre-r1 b/dev-util/rhide/files/digest-rhide-1.5_pre-r1
deleted file mode 100644
index 17c763d817a1..000000000000
--- a/dev-util/rhide/files/digest-rhide-1.5_pre-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 29b77ba1bb28825746c782c85fb3ba9a rhide-1.5pre-20020825.tar.gz 997704
-MD5 26a3040fc6adf966718bbef0be593f56 rhtvision-1.1.4.src.tar.gz 777576
-MD5 649cce68ea455ae4555a99a688864d36 setedit-0.4.57.tar.gz 1629956
-MD5 e9766842f1bbc6c2353de1410d8c0de0 gdb-5.2.1.tar.gz 14715792
diff --git a/dev-util/rhide/files/setedit-0.5.0-fix-includes.patch b/dev-util/rhide/files/setedit-0.5.0-fix-includes.patch
new file mode 100644
index 000000000000..868863a7ed03
--- /dev/null
+++ b/dev-util/rhide/files/setedit-0.5.0-fix-includes.patch
@@ -0,0 +1,10 @@
+--- setedit/makes/editor.mak.orig	2003-04-03 19:26:00.000000000 +0200
++++ setedit/makes/editor.mak	2003-04-03 19:26:04.000000000 +0200
+@@ -812,7 +812,6 @@
+ 	../../tvision/include/tv/opstream.h\
+ 	../../tvision/include/tv/osclipboard.h\
+ 	../../tvision/include/tv/palette.h\
+-	../../tvision/include/tv/parttree.h\
+ 	../../tvision/include/tv/point.h ../../tvision/include/tv/program.h\
+ 	../../tvision/include/tv/pstream.h ../../tvision/include/tv/rect.h\
+ 	../../tvision/include/tv/resource.h\
diff --git a/dev-util/rhide/rhide-1.5-r1.ebuild b/dev-util/rhide/rhide-1.5-r1.ebuild
new file mode 100644
index 000000000000..9a99f2fbdfc9
--- /dev/null
+++ b/dev-util/rhide/rhide-1.5-r1.ebuild
@@ -0,0 +1,285 @@
+# 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.1 2003/04/03 19:07:18 azarah Exp $
+
+IUSE="X"
+
+#SNAPSHOT="20020825"
+TVISIONVER="2.0.1"
+SETEDITVER="0.5.0"
+SETEDIT_S="setedit"
+# RHIDE is _very_ picky about the GDB used, so dont put GDB in DEPEND
+GDBVER="5.3"
+
+DESCRIPTION="RHIDE is a console IDE for various languages."
+if [ -z "${SNAPSHOT}" ]
+then
+	S="${WORKDIR}/${P}"
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+else
+	S="${WORKDIR}/${P/_}-${SNAPSHOT}"
+	SRC_URI="http://rhide.sourceforge.net/snapshots/${P/_}-${SNAPSHOT}.tar.gz
+		mirror://gentoo/${P/_}-${SNAPSHOT}.tar.gz"
+fi
+SRC_URI="${SRC_URI}
+	mirror://sourceforge/tvision/rhtvision-${TVISIONVER}.src.tar.gz
+	mirror://sourceforge/setedit/setedit-${SETEDITVER}.tar.gz
+	mirror://gnu/gdb/gdb-${GDBVER}.tar.bz2"
+HOMEPAGE="http://www.rhide.com/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+DEPEND="virtual/glibc
+	>=app-text/recode-3.6
+	>=dev-libs/libpcre-2.0.6
+	>=sys-apps/bzip2-1.0.1
+	>=sys-apps/texinfo-4.1
+	>=sys-devel/gettext-0.11.0
+	>=dev-lang/perl-5.6
+	>=sys-libs/zlib-1.1.4
+	>=sys-libs/gpm-1.20.0
+	>=sys-libs/ncurses-5.2
+	aalib? ( media-libs/aalib )
+	X? ( virtual/x11 )"
+
+
+src_unpack() {
+	
+	unpack ${A}
+
+	cd ${S}
+
+	# Get it to work with rhtvision-2.0
+	epatch ${FILESDIR}/${P}-rhtvision2.patch
+
+	cd ${WORKDIR}/${SETEDIT_S}
+	# Fix an include problem with official setedit-0.5.0
+	epatch ${FILESDIR}/setedit-${SETEDITVER}-fix-includes.patch
+	
+	# Update snapshot version
+	if [ -n "${SNAPSHOT}" ]
+	then
+		perl -pi -e "s|1998-11-29|${SNAPSHOT}|" ${S}/idemain.cc
+	else
+		perl -pi -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}
+	done
+
+	# Update setedit macro's
+	for x in ${WORKDIR}/${SETEDIT_S}/cfgfiles/*
+	do
+		[ -f "${x}" ] && cp -f ${x} ${S}/share/setedit
+	done
+
+	# Hack to uncomment a needed variable
+	perl -pi -e 's|//cmcUpdateCodePage|cmcUpdateCodePage|' \
+		${WORKDIR}/${SETEDIT_S}/include/ced_coma.h
+}
+
+src_compile() {
+	
+	# Most of these use a _very_ weird build systems,
+	# so please no comments ;/
+	
+# ************* TVision *************
+
+	if [ ! -f "${WORKDIR}/.tvision" ]
+	then
+		cd ${WORKDIR}/tvision || die "TVision source dir do not exist!"
+	
+		DUMMYFLAGS=""
+	
+		./configure --prefix=/usr \
+			--fhs \
+			--cflags='${DUMMYFLAGS}' \
+			--cxxflags='${DUMMYFLAGS}' || die
+	
+		# Only build the static libs
+		perl -pi -e 's/all: static-lib dynamic-lib/all: static-lib/' Makefile
+	
+		# -j breaks build
+		make || die
+
+		touch ${WORKDIR}/.tvision
+	fi
+
+	
+# ************* SetEdit *************
+	
+	if [ ! -f "${WORKDIR}/.setedit" ]
+	then
+		cd ${WORKDIR}/${SETEDIT_S} || die "SetEdit source dir do not exist!"
+	
+		./configure --prefix=/usr \
+			--fhs \
+			--libset \
+			--without-mp3 \
+			`use_with aalib aa` || die
+
+		# Latest texinfo breaks docs, so disable for now ...
+		perl -pi -e 's/needed: internac doc-basic/needed: internac/' \
+			Makefile
+	
+		# -j breaks build
+		make || die
+
+		# Make the docs
+		cd ${WORKDIR}/${SETEDIT_S}/doc
+#		make || die
+
+		touch ${WORKDIR}/.setedit
+	fi
+	
+	
+# ************* RHIDE ***************
+	
+	cd ${S}
+
+	addpredict "/usr/share/rhide"
+
+	export RHIDESRC="${S}"
+	export SETSRC="${WORKDIR}/${SETEDIT_S}"
+	export SETOBJ="${WORKDIR}/${SETEDIT_S}/makes"
+	export TVSRC="${WORKDIR}/tvision"
+	export TVOBJ="${WORKDIR}/tvision/linux"
+	export GDB_SRC="${WORKDIR}/gdb-${GDBVER}"
+
+	#
+	# *** DETECT XFREE86 with tvision-2.0 ***
+	#
+	# None of these packages have any way to specify XFree86 support,
+	# thus we check if tvision compiled with xfree support or not.
+	#
+	# If it did compile with xfree support, we need to get rhide to link
+	# against libX11 ...
+	#
+	local have_xfree="$(gawk '/HAVE_X11/ { if (/yes/) print "Yes" }' \
+	                    ${WORKDIR}/tvision/configure.cache)"
+
+	if [ ! -f "${WORKDIR}/.rhide-configured" ]
+	then
+		econf || die
+		
+		if [ "${have_xfree}" = "Yes" ]
+		then
+			einfo "Compiling with XFree86 support..."
+			perl -pi -e 's|LDFLAGS= |LDFLAGS= -L/usr/X11R6/lib -lXmu|' \
+				${S}/config.env
+
+			touch ${WORKDIR}/.tvision-with-X11
+		else
+			einfo "Compiling without XFree86 support..."
+		fi
+
+		touch "${WORKDIR}/.rhide-configured"
+	fi
+		
+	# -j breaks build
+	make prefix=/usr \
+		install_docdir=share/doc/${PF} \
+		install_infodir=share/info \
+		LDFLAGS="${LDFLAGS} ${myLDFLAGS}" || die
+	
+	# Update and Fix DIR entry in .info files
+	cd ${S}/share/setedit/
+	if [ -f "${WORKDIR}/${SETEDIT_S}/doc/editor.inf" ]
+	then
+		sed -e 's:editor.inf:setedit.info:g' \
+			${WORKDIR}/${SETEDIT_S}/doc/editor.inf > setedit.inf
+	fi
+	if [ -f "${WORKDIR}/${SETEDIT_S}/doc/infeng.inf" ]
+	then
+		sed -e 's:infeng.inf:infview.info:g' \
+			${WORKDIR}/${SETEDIT_S}/doc/infeng.inf > infview.inf
+	fi
+	cd ${S}
+}
+
+src_install() {
+
+	# Dont error out on sandbox violations.  I should really
+	# try to track this down, but its a bit tougher than usually.
+	addpredict "/:/usr/share/rhide:/libide:/libtvuti:/librhuti"
+	
+	make prefix=${D}/usr \
+		install_docdir=share/doc/${PF} \
+		install_infodir=share/info \
+		install || die
+	
+	# Install default CFG file and fix the paths
+	cd ${D}/usr/share/rhide
+	sed -e 's:/usr/local/share:/usr/share:g' \
+		rhide_.env >rhide.env
+	echo 'INFOPATH=/usr/share/info' >> rhide.env
+
+	# Install sample TVision config file
+	insinto /etc
+	doins ${FILESDIR}/tvrc
+
+	# Install env file
+	insinto /etc/env.d
+	doins ${FILESDIR}/80rhide
+
+	# We only need the Eterm stuff if TVision was not compiled
+	# with X11 support ...
+	if [ ! -f "${WORKDIR}/.tvision-with-X11" ]
+	then
+		# Install the terminfo file
+		tic -o ${D}/usr/share/terminfo \
+			${WORKDIR}/tvision/extra/eterm/xterm-eterm-tv
+		insinto /usr/share/Eterm/themes/Setedit
+
+		dosed 's:Eterm --title:Eterm --theme Setedit --title:' /usr/bin/rhidex
+		dosed 's:Eterm --title:Eterm --theme Setedit --title:' /usr/bin/rhgdbx
+
+		# Install the Eterm theme
+		for x in ${WORKDIR}/tvision/extra/eterm/Setedit/*
+		do
+			[ -f "${x}" ] && doins ${x}
+		done
+	else
+		rm -f ${D}/usr/bin/{rhide,rhgdb}x
+	fi
+
+	# Fix .info files
+	for x in ${D}/usr/share/info/*.inf
+	do
+		[ -f "${x}" ] && mv -f ${x} ${x}o
+	done
+
+	# Install the manpages
+	for x in ${WORKDIR}/${SETEDIT_S}/doc/*.1
+	do
+		[ -f "${x}" ] && doman ${x}
+	done
+
+	cd ${S}
+	dodoc todo
+	cd ${WORKDIR}/tvision
+	docinto tvision
+	dodoc THANKS TODO borland.txt change.log change1.log readme.txt doc/*.txt
+	cd ${WORKDIR}/${SETEDIT_S}
+	docinto setedit
+	dodoc README TODO change.log change0.log copying.*
+}
+
+pkg_postinst() {
+	if [ -x "${ROOT}/usr/bin/rhidex" ]
+	then
+		echo
+		einfo "You might consider installing Eterm to be able to use the rhidex"
+		einfo "version of RHIDE that have better keyboard support under X:"
+		echo
+		einfo "  # emerge eterm"
+		echo
+	fi
+}
+
diff --git a/dev-util/rhide/rhide-1.5.ebuild b/dev-util/rhide/rhide-1.5.ebuild
index e68a7eb257b9..9cfddc8d9d77 100644
--- a/dev-util/rhide/rhide-1.5.ebuild
+++ b/dev-util/rhide/rhide-1.5.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.ebuild,v 1.1 2003/03/22 21:52:54 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/rhide-1.5.ebuild,v 1.2 2003/04/03 19:07:18 azarah Exp $
 
 IUSE="X"
 
@@ -29,7 +29,7 @@ HOMEPAGE="http://www.rhide.com/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND="virtual/glibc
 	>=app-text/recode-3.6
diff --git a/dev-util/rhide/rhide-1.5_pre-r1.ebuild b/dev-util/rhide/rhide-1.5_pre-r1.ebuild
deleted file mode 100644
index 3b46b7f7d9d1..000000000000
--- a/dev-util/rhide/rhide-1.5_pre-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# 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_pre-r1.ebuild,v 1.5 2003/03/11 21:11:45 seemant Exp $
-
-IUSE="X"
-
-SNAPSHOT="20020825"
-TVISIONVER="1.1.4"
-SETEDITVER="0.4.57"
-# RHIDE is _very_ picky about the GDB used, so dont put GDB in DEPEND
-GDBVER="5.2.1"
-
-DESCRIPTION="RHIDE is a console IDE for various languages."
-if [ -z "${SNAPSHOT}" ] ; then
-	S="${WORKDIR}/${P}"
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-else
-	S="${WORKDIR}/${P/_}-${SNAPSHOT}"
-	SRC_URI="http://rhide.sourceforge.net/snapshots/${P/_}-${SNAPSHOT}.tar.gz
-		mirror://gentoo/${P/_}-${SNAPSHOT}.tar.gz"
-fi
-SRC_URI="${SRC_URI}
-	mirror://sourceforge/setedit/rhtvision-${TVISIONVER}.src.tar.gz
-	mirror://sourceforge/setedit/setedit-${SETEDITVER}.tar.gz
-	ftp://sourceware.cygnus.com/pub/gdb/releases/gdb-${GDBVER}.tar.gz"
-HOMEPAGE="http://www.rhide.com/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DEPEND="virtual/glibc
-	app-text/tetex
-	>=app-text/recode-3.6
-	>=dev-libs/libpcre-2.0.6
-	>=sys-apps/bzip2-1.0.1
-	>=sys-apps/texinfo-4.1
-	>=sys-devel/gettext-0.11.0
-	>=dev-lang/perl-5.6
-	>=sys-libs/zlib-1.1.4
-	>=sys-libs/gpm-1.20.0
-	>=sys-libs/ncurses-5.2
-	X? ( virtual/x11 )"
-
-RDEPEND="${DEPEND}
-	X? ( x11-terms/eterm )"
-
-
-src_unpack() {
-	
-	unpack ${A}
-
-	cd ${S}
-	# Get it to compile with gdb-5.2.1
-	# <azarah@gentoo.org> (22 Sep 2002)
-	patch -p1 < ${FILESDIR}/${P}-gdb521-IS_FP_REGNUM.patch || die
-	patch -p1 < ${FILESDIR}/${P}-gdb521-REGISTER_NAMES.patch || die
-
-	cd ${WORKDIR}/tvision
-	# Get tvision-1.1.4 to compile with gcc-3.1 or later
-	# <azarah@gentoo.org> (22 Sep 2002)
-	patch -p1 < ${FILESDIR}/tvision-1.1.4-gcc31-filebuf.patch || die
-}
-
-src_compile() {
-	
-	# Most of these use a _very_ weird build systems,
-	# so please no comments ;/
-	
-# ************* TVision *************
-	
-	cd ${WORKDIR}/tvision/
-	
-	DUMMYFLAGS=""
-	
-	./configure --prefix=/usr \
-		--fhs \
-		--cflags='${DUMMYFLAGS}' \
-		--cxxflags='${DUMMYFLAGS}' || die
-	
-	# Only build the static libs
-	perl -pi -e 's/all: static-lib dynamic-lib/all: static-lib/' Makefile
-	
-	# -j breaks build
-	make || die
-
-	
-# ************* SetEdit *************
-	
-	cd ${WORKDIR}/setedit/
-	
-	./configure --prefix=/usr \
-		--fhs \
-		--libset || die
-	
-	# -j breaks build
-	make || die
-
-	# Make the docs
-	cd ${WORKDIR}/setedit/doc
-	make || die
-	
-	
-# ************* RHIDE ***************
-	
-	cd ${S}
-
-	addpredict "/usr/share/rhide"
-
-	# Update snapshot version
-	if [ -n "${SNAPSHOT}" ]
-	then
-		perl -pi -e "s|1998-11-29|${SNAPSHOT}|" ${S}/idemain.cc
-	fi
-	
-	# Fix invalid "-O2" in CFLAGS and CXXFLAGS
-	for x in configure $(find . -name '*.mak') $(find . -name 'makefile.src')
-	do
-		if [ -f ${x} ]
-		then
-			perl -pi -e 's:-O2::g' ${x}
-		fi
-	done
-
-	# Fix a dependency due to a broken .mak file
-	perl -pi -e 's:../../../../::g' rh_comm.mak
-
-	export RHIDESRC="${S}"
-	export SETSRC="${WORKDIR}/setedit"
-	export SETOBJ="${WORKDIR}/setedit/makes"
-	export TVSRC="${WORKDIR}/tvision"
-	export TVOBJ="${WORKDIR}/tvision/linux"
-	export GDB_SRC="${WORKDIR}/gdb-${GDBVER}"
-
-	econf || die
-	
-	#
-	# *** DETECT XFREE86 with tvision-2.0 ***
-	#
-	# None of these packages have any way to specify XFree86 support,
-	# thus we check if tvision compiled with xfree support or not.
-	#
-	# If it did compile with xfree support, we need to get rhide to link
-	# against libX11 ...
-	#
-	local myLDFLAGS=""
-	local have_xfree="$(gawk '/HAVE_X11/ { if (/yes/) print "Have XFree86" }' \
-	                    ${WORKDIR}/tvision/configure.cache)"
-
-	if [ "${have_xfree}" = "Have XFree86" ]
-	then
-		einfo "Compiling with XFree86 support..."
-		myLDFLAGS="-L/usr/X11R6/lib -lX11"
-	else
-		einfo "Compiling without XFree86 support..."
-	fi
-	#
-	# *** DETECT XFREE86 ***
-	#
-		
-	# -j breaks build
-	make prefix=/usr \
-		install_docdir=share/doc/${PF} \
-		install_infodir=share/info \
-		LDFLAGS="${LDFLAGS} ${myLDFLAGS}" || die
-	
-	# Update and Fix DIR entry in .info files
-	cd ${S}/share/setedit/
-	sed -e 's:editor.inf:setedit.info:g' \
-		${WORKDIR}/setedit/doc/editor.inf > setedit.inf
-	sed -e 's:infeng.inf:infview.info:g' \
-		${WORKDIR}/setedit/doc/infeng.inf > infview.inf
-	cd ${S}
-	
-	# Update setedit macro's
-	cp -f ${WORKDIR}/setedit/cfgfiles/*.pmc ${S}/share/setedit
-}
-
-src_install() {
-
-	# Dont error out on sandbox violations.  I should really
-	# try to track this down, but its a bit tougher than usually.
-	addpredict "/:/usr/share/rhide:/libide:/libtvuti:/librhuti"
-	
-	make prefix=${D}/usr \
-		install_docdir=share/doc/${PF} \
-		install_infodir=share/info \
-		install || die
-	
-	# Fix .info files
-	for file in ${D}/usr/share/info/*.inf
-	do
-		if [ -f ${file} ]
-		then
-			mv -f ${file} ${file}o
-		fi
-	done
-
-	# Install the manpages
-	cd ${WORKDIR}/setedit/doc
-	doman 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' \
-		rhide_.env >rhide.env
-	echo 'INFOPATH=/usr/share/info' >> rhide.env
-
-	# Install the terminfo file
-	tic -o ${D}/usr/share/terminfo \
-		${WORKDIR}/tvision/extra/eterm/xterm-eterm-tv
-
-	# Install env file
-	insinto /etc/env.d
-	doins ${FILESDIR}/80rhide
-}
-