x86 stable wrt #192290 and remove old

(Portage version: 2.1.2.12)

4 files changed, 7 insertions, 103 deletions

diff --git a/x11-libs/xview/ChangeLog b/x11-libs/xview/ChangeLog
index da9425f4d820..de9bd860e8b9 100644
--- a/x11-libs/xview/ChangeLog
+++ b/x11-libs/xview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/xview
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/ChangeLog,v 1.27 2007/07/22 03:12:39 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/ChangeLog,v 1.28 2007/09/12 21:41:45 armin76 Exp $
+
+  12 Sep 2007; Raúl Porcel <armin76@gentoo.org> -xview-3.2-r5.ebuild,
+  xview-3.2-r6.ebuild:
+  x86 stable wrt #192290 and remove old
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; xview-3.2-r5.ebuild:
   Drop virtual/x11 references.
diff --git a/x11-libs/xview/files/digest-xview-3.2-r5 b/x11-libs/xview/files/digest-xview-3.2-r5
deleted file mode 100644
index f3a34206ae99..000000000000
--- a/x11-libs/xview/files/digest-xview-3.2-r5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 f804d91f5b154f95872a23e86d1a621e xview-3.2-gcc-4.1-v0.1.patch.bz2 8018
-RMD160 0387c073d7f4c8303467f3065ba2a573fdb6710e xview-3.2-gcc-4.1-v0.1.patch.bz2 8018
-SHA256 2b26f10122535eff43a4f87fc97ffb54eac88c312a3688b05bce806ce9a273ba xview-3.2-gcc-4.1-v0.1.patch.bz2 8018
-MD5 a61e7ce82cac041a2c613041dc003de5 xview-3.2p1.4-18c.tar.gz 3377010
-RMD160 2d77c7988a483871e0f316ccb03d3b82e9978c45 xview-3.2p1.4-18c.tar.gz 3377010
-SHA256 3bf4b77257881e7146b35fe674e4d4c4f2708cb58b947a17f099d12b166a60c5 xview-3.2p1.4-18c.tar.gz 3377010
diff --git a/x11-libs/xview/xview-3.2-r5.ebuild b/x11-libs/xview/xview-3.2-r5.ebuild
deleted file mode 100644
index 7f461f7bddd6..000000000000
--- a/x11-libs/xview/xview-3.2-r5.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/xview-3.2-r5.ebuild,v 1.6 2007/07/22 03:12:39 dberkholz Exp $
-
-inherit eutils
-
-MY_PN="${P}p1.4-18c"
-GCC_PATCHVER="0.1"
-
-DESCRIPTION="The X Window-System-based Visual/Integrated Environment for Workstations"
-HOMEPAGE="http://physionet.caregroup.harvard.edu/physiotools/xview/"
-LICENSE="sun-openlook"
-# We use the xview tarball available from the X organization, but xfree86 appears
-# to be up and available more often so we use that (it's their primary mirror).
-SRC_URI="http://physionet.caregroup.harvard.edu/physiotools/xview/${MY_PN}.tar.gz
-		mirror://gentoo/${P}-gcc-4.1-v${GCC_PATCHVER}.patch.bz2"
-		# mirror://debian/pool/main/x/xview/${SRC_PATCH}.gz
-
-SLOT="0"
-IUSE=""
-KEYWORDS="-alpha -amd64 ~ppc ~sparc x86"
-
-RDEPEND="x11-libs/libXpm
-	x11-proto/xextproto
-	media-fonts/font-bh-75dpi
-	media-fonts/font-sun-misc"
-
-DEPEND="${RDEPEND}
-	app-text/rman
-	x11-misc/gccmakedep
-	x11-misc/imake"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# This is our compound patch derived from debian. We use it because:
-	#  * xview is a contribution made by Sun Microsystems (?) to the X community,
-	#    but fixes for it don't appear to be around other than in the other free
-	#    distributions.
-	#  * It does little harm, only some defaults are changed which we can redefine
-	#    anyway.
-	#
-	# SRC_PATCH="${PN}_3.2p1.4-16woody2.diff"
-	epatch "${FILESDIR}"/CAN-2005-0076.patch
-	epatch "${FILESDIR}"/lseek.diff
-	epatch "${DISTDIR}"/${P}-gcc-4.1-v${GCC_PATCHVER}.patch.bz2
-
-	# Do not build xgettext and msgfmt since they are provided by the gettext
-	# package. Using the programs provided by xview breaks many packages
-	# including vim, grep and binutils.
-	sed -e 's/MSG_UTIL = xgettext msgfmt/#MSG_UTIL = xgettext msgfmt/' \
-		-i util/Imakefile || die "gettext sed failed"
-
-	# (#120910) Look for imake in the right place
-	sed -i -e 's:\/X11::' imake || die "imake sed failed"
-}
-
-src_compile() {
-	# Create the makefile
-	imake -DUseInstalled -I"${S}"/config -I/usr/X11R6/lib/X11/config \
-		|| die "imake failed"
-
-	# This is crazy and I know it, but wait till you read the code in
-	# Build-LinuxXView.bash.
-	OPENWINHOME="/usr/X11R6" bash Build-LinuxXView.bash libs \
-		|| die "building libs failed"
-	OPENWINHOME="/usr/X11R6" bash Build-LinuxXView.bash clients \
-		|| die "building clients failed"
-	OPENWINHOME="/usr/X11R6" bash Build-LinuxXView.bash contrib \
-		|| die "building contrib failed"
-	OPENWINHOME="/usr/X11R6" bash Build-LinuxXView.bash olvwm \
-		|| die "building olvwm failed"
-}
-
-src_install() {
-	DESTDIR="${D}" OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash instlibs \
-		|| die "installing libs failed"
-	DESTDIR="${D}" OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash instclients \
-		|| die "installing clients failed"
-	DESTDIR="${D}" OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash instcontrib \
-		|| die "installing contrib failed"
-	DESTDIR="${D}" OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash instolvwm \
-		|| die "installing olvwm failed"
-	cd "${D}"/usr
-	ln -s X11R6 openwin
-
-	# The rest of the docs is already installed
-	cd "${S}"/doc
-	dodoc README xview-info olgx_api.txt olgx_api.ps sel_api.txt \
-		dnd_api.txt whats_new.ps bugform config/usenixws/paper.ps
-	rm -rf "${D}"/usr/X11R6/share/doc/xview && rm -rf "${D}"/usr/X11R6/share/doc
-}
diff --git a/x11-libs/xview/xview-3.2-r6.ebuild b/x11-libs/xview/xview-3.2-r6.ebuild
index 91ead6123b17..a5a97ff2d678 100644
--- a/x11-libs/xview/xview-3.2-r6.ebuild
+++ b/x11-libs/xview/xview-3.2-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/xview-3.2-r6.ebuild,v 1.3 2007/07/01 19:10:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/xview-3.2-r6.ebuild,v 1.4 2007/09/12 21:41:45 armin76 Exp $
 
 inherit eutils
 
@@ -18,7 +18,7 @@ SRC_URI="http://physionet.caregroup.harvard.edu/physiotools/xview/${MY_PN}.tar.g
 
 SLOT="0"
 IUSE=""
-KEYWORDS="-alpha -amd64 ~ppc ~sparc ~x86"
+KEYWORDS="-alpha -amd64 ~ppc ~sparc x86"
 
 RDEPEND="x11-libs/libXpm
 	x11-proto/xextproto