Update snapshot and do a few needed cleanups.

(Portage version: 2.0.51.22-r2)

5 files changed, 310 insertions, 8 deletions

diff --git a/dev-util/rhide/ChangeLog b/dev-util/rhide/ChangeLog
index 2a31b344fcaf..836cd485f5af 100644
--- a/dev-util/rhide/ChangeLog
+++ b/dev-util/rhide/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/rhide
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/ChangeLog,v 1.14 2004/07/02 05:12:58 eradicator Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/ChangeLog,v 1.15 2005/08/29 02:46:40 azarah Exp $
+
+*rhide-1.5.20050823 (29 Aug 2005)
+
+  29 Aug 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/rhide-1.5.20050823-amd64-support.patch, +rhide-1.5.20050823.ebuild:
+  Update snapshot and do a few needed cleanups.
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> rhide-1.5-r1.ebuild,
   rhide-1.5.ebuild:
diff --git a/dev-util/rhide/Manifest b/dev-util/rhide/Manifest
index 440ee091cdaa..eed40127d444 100644
--- a/dev-util/rhide/Manifest
+++ b/dev-util/rhide/Manifest
@@ -1,11 +1,15 @@
-MD5 d03d9a5c5628c18c347ecee81df0bda2 rhide-1.5.ebuild 6664
-MD5 77beedd15d778a0153d122b14854718e rhide-1.5-r1.ebuild 7004
+MD5 77020e187f61bbbabcec65c2afa4092e rhide-1.5.20050823.ebuild 6923
 MD5 327e10ec49741d4dc3731dea9230d57b ChangeLog 2568
-MD5 5a96d86d3e84dac00c7042aaa9107ee7 files/tvrc 123
-MD5 6ff94c75f70caf1f06d4fd1011c516c3 files/rhide-1.5-gcc-3.3.patch 1837
+MD5 6d96bbfd2227f8f91e641798acad0acf .rhide-1.5.20050823.ebuild.swp 16384
+MD5 77beedd15d778a0153d122b14854718e rhide-1.5-r1.ebuild 7004
+MD5 d03d9a5c5628c18c347ecee81df0bda2 rhide-1.5.ebuild 6664
 MD5 e89c29aba20b5734aaa85e4156848a1d files/tvision-1.1.4-gcc31-filebuf.patch 5921
+MD5 6ff94c75f70caf1f06d4fd1011c516c3 files/rhide-1.5-gcc-3.3.patch 1837
+MD5 a6c2683f6390c63674a6db90d653a66e files/digest-rhide-1.5.20050823 285
 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 8c387a4a4dba33ca685bd5adeb06cd86 files/rhide-1.5.20050823-amd64-support.patch 394
+MD5 85d4b0e04b34c3c230795c9588ef044b files/rhide-1.5-rhtvision2.patch 3528
+MD5 5fc15112eb4dc31a46ef3e687d90279a files/digest-rhide-1.5 261
+MD5 5a96d86d3e84dac00c7042aaa9107ee7 files/tvrc 123
diff --git a/dev-util/rhide/files/digest-rhide-1.5.20050823 b/dev-util/rhide/files/digest-rhide-1.5.20050823
new file mode 100644
index 000000000000..9cd148c31a8f
--- /dev/null
+++ b/dev-util/rhide/files/digest-rhide-1.5.20050823
@@ -0,0 +1,4 @@
+MD5 a63feb8650a1b1c472e116e30feeb3c4 rhide-1.5.20050823.tar.bz2 765258
+MD5 938319aabc91b765fd2408bfacafc5c7 tvision-2.10.20050824.tar.bz2 863122
+MD5 05a676191694ebf4ac8573e119bdb61b setedit-0.5.5.20050828.tar.bz2 1960480
+MD5 dd25473f61a3a2e1b08dee5f67ebae28 gdb-6.1.1.tar.bz2 12586670
diff --git a/dev-util/rhide/files/rhide-1.5.20050823-amd64-support.patch b/dev-util/rhide/files/rhide-1.5.20050823-amd64-support.patch
new file mode 100644
index 000000000000..6a35a9665266
--- /dev/null
+++ b/dev-util/rhide/files/rhide-1.5.20050823-amd64-support.patch
@@ -0,0 +1,10 @@
+--- rhide-1.5.20050823/configure.in	2005-08-29 02:34:53.000000000 +0200
++++ rhide-1.5.20050823.az/configure.in	2005-08-29 02:35:51.000000000 +0200
+@@ -8,6 +8,7 @@
+ 
+ case "$host" in
+   i?86-*-linux*) rhide_OS=Linux ;;
++  x86_64-*-linux*) rhide_OS=Linux ;;
+   i?86-pc-msdosdjgpp) rhide_OS=DJGPP ;;
+   *-pc-cygwin) rhide_OS=CYGWIN ;;
+   *) AC_MSG_ERROR([$host is not supported (yet). Sorry.]) ;;
diff --git a/dev-util/rhide/rhide-1.5.20050823.ebuild b/dev-util/rhide/rhide-1.5.20050823.ebuild
new file mode 100644
index 000000000000..fe3aa0a7065f
--- /dev/null
+++ b/dev-util/rhide/rhide-1.5.20050823.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/rhide-1.5.20050823.ebuild,v 1.1 2005/08/29 02:46:40 azarah Exp $
+
+inherit eutils multilib toolchain-funcs
+
+SNAPSHOT="20050823"
+TVISIONVER="2.10.20050824"
+SETEDITVER="0.5.5.20050828"
+# RHIDE is _very_ picky about the GDB used, so dont put GDB in DEPEND
+GDBVER="6.1.1"
+
+# Used when you do not want to link TVision against X11, but do
+# want to use RHIDE inside of X ...
+ETERM_HACK="no"
+
+DESCRIPTION="Console IDE for various languages"
+HOMEPAGE="http://www.rhide.com/"
+if [ -z "${SNAPSHOT}" ]
+then
+	SRC_URI="http://rhide.sourceforge.net/snapshots/${P}.tar.gz
+		mirror://sourceforge/${PN}/${P}.tar.gz"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2
+		http://dev.gentoo.org/~azarah/rhide/${P}.tar.bz2"
+	#http://rhide.sourceforge.net/snapshots/${P/_}-${SNAPSHOT}.tar.gz
+fi
+SRC_URI="${SRC_URI}
+	mirror://gentoo/tvision-${TVISIONVER}.tar.bz2
+	http://dev.gentoo.org/~azarah/rhide/tvision-${TVISIONVER}.tar.bz2
+	mirror://gentoo/setedit-${SETEDITVER}.tar.bz2
+	http://dev.gentoo.org/~azarah/rhide/setedit-${SETEDITVER}.tar.bz2
+	mirror://gnu/gdb/gdb-${GDBVER}.tar.bz2"
+#	mirror://sourceforge/tvision/rhtvision-${TVISIONVER}.src.tar.gz
+#	mirror://sourceforge/setedit/setedit-${SETEDITVER}.tar.gz
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="X aalib"
+
+DEPEND="virtual/libc
+	>=dev-libs/libpcre-2.0.6
+	>=app-arch/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 )
+	>=sys-apps/sed-4.0.7"
+
+TV_S="${WORKDIR}/tvision"
+SE_S="${WORKDIR}/setedit"
+
+src_unpack() {
+	unpack ${A}
+
+	# Add support for amd64
+	for x in "${S}" "${S}/libtvuti" ; do
+		cd "${x}"
+		epatch "${FILESDIR}/${P}-amd64-support.patch"
+		autoconf
+	done
+
+	# Update snapshot version
+	if [[ -n ${SNAPSHOT} ]] ; then
+		sed -i -e "s|1998-11-29|${SNAPSHOT}|" "${S}/idemain.cc"
+	else
+		sed -i -e "s|1998-11-29|`date +%F`|" "${S}/idemain.cc"
+	fi
+
+	# Fix invalid "-O2" in CFLAGS and CXXFLAGS
+	for x in configure \
+	         $(find "${S}/" -name '*.mak') \
+	         $(find "${S}/" -name 'makefile.src')
+	do
+		[[ -f ${x} ]] && sed -i -e 's:-O2::g' "${x}"
+	done
+
+	# Update setedit macro's
+	for x in "${SE_S}/cfgfiles"/* ; do
+		[[ -f ${x} ]] && cp -f "${x}" "${S}/share/setedit/"
+	done
+
+	# Lame attempt to rip out X11 detection
+	if useq !X ; then
+		einfo "Disabling X support"
+		cp -f "${TV_S}/config.pl" "${TV_S}/config.pl.X11"
+		sed -i -e \
+			"s:\$conf{'HAVE_X11'}='yes':\$conf{'HAVE_X11'}='no':g" \
+			"${TV_S}/config.pl"
+		# Sanity check
+		[[ -z $(diff -u "${TV_S}/config.pl" "${TV_S}/config.pl.X11") ]] \
+			&& die "TVision's config.pl was not changed!"
+	fi
+
+	# 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):' \
+		"${SE_S}/internac/gnumake.in"
+}
+
+src_compile() {
+
+	# Most of these use a _very_ weird build systems,
+	# so please no comments ;/
+
+# ************* TVision *************
+
+	if [[ ! -f ${WORKDIR}/.tvision ]] ; then
+		cd "${TV_S}" || die "TVision source dir do not exist!"
+
+		einfo "Configuring TVision ..."
+		CC=$(tc-getCC) CXX=$(tc-getCXX) \
+		./configure --prefix="/usr" \
+			--x-include="${ROOT}/usr/include" \
+			--x-lib="${ROOT}/usr/$(get_libdir)" \
+			--fhs \
+			--without-dynamic || die
+
+		einfo "Building TVision ..."
+		emake || die
+
+		touch ${WORKDIR}/.tvision
+	fi
+
+
+# ************* SetEdit *************
+
+	if [[ ! -f ${WORKDIR}/.setedit ]] ; then
+		cd "${SE_S}" || die "SetEdit source dir do not exist!"
+
+		einfo "Configuring SetEdit ..."
+		CC=$(tc-getCC) CXX=$(tc-getCXX) \
+		./configure --prefix=/usr \
+			--fhs \
+			--libset \
+			--static \
+			--without-mp3 \
+			--without-mixer \
+			--without-migdb \
+			`use_with aalib aa` || die
+
+		einfo "Building SetEdit ..."
+		emake || die
+
+		# Make the docs
+		cd "${SE_S}/doc"
+		make || die
+
+		touch "${WORKDIR}/.setedit"
+	fi
+
+
+# ************* RHIDE ***************
+
+	cd "${S}"
+
+#	addpredict "/usr/share/rhide"
+
+	export RHIDESRC="${S}"
+	export SETSRC="${SE_S}"
+	export SETOBJ="${SE_S}/makes"
+	export TVSRC="${TV_S}"
+	export TVOBJ="${TV_S}/makes"
+	export GDB_SRC="${WORKDIR}/gdb-${GDBVER}"
+
+	if [[ ! -f ${WORKDIR}/.rhide-configured ]] ; then
+		einfo "Configuring RHIDE ..."
+		CC=$(tc-getCC) CXX=$(tc-getCXX) \
+		econf || die
+
+		touch "${WORKDIR}/.rhide-configured"
+	fi
+
+	einfo "Building RHIDE ..."
+	# For now 'make -jx' breaks building
+	make CC=$(tc-getCC) CXX=$(tc-getCXX) \
+		RHIDE_GCC=$(tc-getCC) \
+		RHIDE_GXX=$(tc-getCXX) \
+		prefix="/usr" \
+		install_docdir="share/doc/${PF}" \
+		install_infodir="share/info" || die
+
+	# Update and Fix DIR entry in .info files
+	if [[ -f ${SE_S}/doc/editor.inf ]] ; then
+		sed -e 's:editor.inf:setedit.info:g' \
+			"${SE_S}/doc/editor.inf" > "${S}/share/setedit/setedit.inf"
+	fi
+	if [[ -f ${SE_S}/doc/infeng.inf ]] ; then
+		sed -e 's:infeng.inf:infview.info:g' \
+			"${SE_S}/doc/infeng.inf" > "${S}/share/setedit/infview.inf"
+	fi
+}
+
+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
+	sed -e 's:/usr/local/share:/usr/share:g' \
+		"${D}/usr/share/rhide/rhide_.env" > \
+		"${D}/usr/share/rhide/rhide.env"
+	echo 'INFOPATH=/usr/share/info' >> \
+		"${D}/usr/share/rhide/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 [[ ${ETERM_HACK} == "yes" ]] && useq !X ; then
+		# Install the terminfo file
+		tic -o "${D}/usr/share/terminfo" \
+			"${TV_S}/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 "${TV_S}/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 "${SE_S}/doc"/*.1
+	do
+		[[ -f ${x} ]] && doman "${x}"
+	done
+
+	cd "${S}"
+	dodoc todo
+	cd "${TV_S}"
+	docinto tvision
+	dodoc THANKS TODO borland.txt change.log change1.log copying* readme.txt
+	dodoc doc/*.{txt,html}
+	cd "${SE_S}"
+	docinto setedit
+	dodoc README TODO change.log change0.log copyrigh* copying.*
+}
+
+pkg_postinst() {
+	if [[ -x "${ROOT}/usr/bin/rhidex" && ${ETERM_HACK} == "yes" ]] ; 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
+}