cleanup

9 files changed, 27 insertions, 190 deletions

diff --git a/app-misc/screen/files/digest-screen-3.9.11 b/app-misc/screen/files/digest-screen-3.9.11
deleted file mode 100644
index 0e192c97e584..000000000000
--- a/app-misc/screen/files/digest-screen-3.9.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 19572f92404995e7b2dea8117204dd67 screen-3.9.11.tar.gz 722396
diff --git a/app-misc/screen/files/digest-screen-3.9.11-r1 b/app-misc/screen/files/digest-screen-3.9.11-r1
deleted file mode 100644
index 0e192c97e584..000000000000
--- a/app-misc/screen/files/digest-screen-3.9.11-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 19572f92404995e7b2dea8117204dd67 screen-3.9.11.tar.gz 722396
diff --git a/app-misc/screen/files/digest-screen-3.9.9 b/app-misc/screen/files/digest-screen-3.9.9
deleted file mode 100644
index bc21a28498c7..000000000000
--- a/app-misc/screen/files/digest-screen-3.9.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9a8b1d6c7438c64b884c4f7d7662afdc screen-3.9.9.tar.gz 524834
diff --git a/app-misc/screen/files/screen-3.9.9-texi.patch b/app-misc/screen/files/screen-3.9.9-texi.patch
deleted file mode 100644
index a82abecdc729..000000000000
--- a/app-misc/screen/files/screen-3.9.9-texi.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -rNu screen-3.9.9.clean/doc/screen.texinfo screen-3.9.9/doc/screen.texinfo
---- screen-3.9.9.clean/doc/screen.texinfo	Fri May 25 09:40:02 2001
-+++ screen-3.9.9/doc/screen.texinfo	Thu Aug 16 00:28:38 2001
-@@ -8,9 +8,12 @@
- @c %**end of header
- @set version 3.9.9
- 
--@direntry
-+@format
-+INFO-DIR-SECTION Utilities
-+START-INFO-DIR-ENTRY
- * Screen: (screen).             Full-screen window manager.
--@end direntry
-+END-INFO-DIR-ENTRY
-+@end format
- 
- @c For examples, use a literal escape in info.
- @ifinfo
diff --git a/app-misc/screen/screen-3.9.11-r1.ebuild b/app-misc/screen/screen-3.9.11-r1.ebuild
deleted file mode 100644
index 6a3936153301..000000000000
--- a/app-misc/screen/screen-3.9.11-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens
-# $Header: /home/cvsroot/gentoo-x86/app-misc/screen.ebuild,v 1.2 2001/04/21
-# 19:25 CST blutgens Exp $
-
-#P=
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION=" Screen is a full-screen window manager that multiplexes a
-physical terminal between several processes"
-SRC_URI="ftp://ftp.uni-erlangen.de/pub/utilities/screen/${A}"
-HOMEPAGE="http://www.gnu.org/software/screen/"
-
-DEPEND="virtual/glibc
-        >=sys-libs/ncurses-5.2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-src_compile() {
-    # ./configure attempts to set the permissions of `tty`
-    # to its current permission
-    addwrite "/dev/vc"
-    addwrite "/dev/pts"
-
-    try ./configure --prefix=/usr --host=${CHOST} \
-	--with-sys-screenrc=/etc/screen/screenrc \
-	--mandir=/usr/share --libexecdir=/usr/lib/misc
-    try emake
-
-}
-
-src_install () {
-
-    dobin screen
-    insinto /usr/share/terminfo
-    doins terminfo/screencap
-    insinto /etc/screen
-    doins etc/screenrc
-    dodoc README ChangeLog INSTALL COPYING TODO NEWS* \
-	 doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-    doman doc/screen.1
-	 doinfo doc/screen.info*
-
-}
-
diff --git a/app-misc/screen/screen-3.9.11-r2.ebuild b/app-misc/screen/screen-3.9.11-r2.ebuild
index 957f9ec0d1a3..699a5da421e8 100644
--- a/app-misc/screen/screen-3.9.11-r2.ebuild
+++ b/app-misc/screen/screen-3.9.11-r2.ebuild
@@ -4,17 +4,14 @@
 # $Header: /home/cvsroot/gentoo-x86/app-misc/screen.ebuild,v 1.2 2001/04/21
 # 19:25 CST blutgens Exp $
 
-#P=
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION=" Screen is a full-screen window manager that multiplexes a
 physical terminal between several processes"
-SRC_URI="ftp://ftp.uni-erlangen.de/pub/utilities/screen/${A}"
+SRC_URI="ftp://ftp.uni-erlangen.de/pub/utilities/screen/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/screen/"
 
 DEPEND="virtual/glibc
-        >=sys-libs/ncurses-5.2
-	>=sys-apps/portage-1.8.18"
+	>=sys-libs/ncurses-5.2"
 
 src_unpack() {
 	unpack ${A}
@@ -22,24 +19,26 @@ src_unpack() {
 }
 src_compile() {
 
-    try ./configure --prefix=/usr --host=${CHOST} \
-	--with-sys-screenrc=/etc/screen/screenrc \
-	--mandir=/usr/share --libexecdir=/usr/lib/misc
-    try emake
+	./configure \
+		--prefix=/usr \
+		--host=${CHOST} \
+		--with-sys-screenrc=/etc/screen/screenrc \
+		--mandir=/usr/share \
+		--libexecdir=/usr/lib/misc || die
+	emake || die
 
 }
 
 src_install () {
 
-    dobin screen
-    insinto /usr/share/terminfo
-    doins terminfo/screencap
-    insinto /etc/screen
-    doins etc/screenrc
-    dodoc README ChangeLog INSTALL COPYING TODO NEWS* \
-	 doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-    doman doc/screen.1
-	 doinfo doc/screen.info*
+	dobin screen
+	insinto /usr/share/terminfo
+	doins terminfo/screencap
+	insinto /etc/screen
+	doins etc/screenrc
+	dodoc README ChangeLog INSTALL COPYING TODO NEWS* \
+	doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+	doman doc/screen.1
+	doinfo doc/screen.info*
 
 }
-
diff --git a/app-misc/screen/screen-3.9.11.ebuild b/app-misc/screen/screen-3.9.11.ebuild
deleted file mode 100644
index 0244917eef38..000000000000
--- a/app-misc/screen/screen-3.9.11.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens
-# $Header: /home/cvsroot/gentoo-x86/app-misc/screen.ebuild,v 1.2 2001/04/21
-# 19:25 CST blutgens Exp $
-
-#P=
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION=" Screen is a full-screen window manager that multiplexes a
-physical terminal between several processes"
-SRC_URI="ftp://ftp.uni-erlangen.de/pub/utilities/screen/${A}"
-HOMEPAGE="http://www.gnu.org/software/screen/"
-
-DEPEND="virtual/glibc
-        >=sys-libs/ncurses-5.2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-src_compile() {
-
-    try ./configure --prefix=/usr --host=${CHOST} \
-	--with-sys-screenrc=/etc/screen/screenrc \
-	--mandir=/usr/share --libexecdir=/usr/lib/misc
-    try emake
-
-}
-
-src_install () {
-
-    dobin screen
-    insinto /usr/share/terminfo
-    doins terminfo/screencap
-    insinto /etc/screen
-    doins etc/screenrc
-    dodoc README ChangeLog INSTALL COPYING TODO NEWS* \
-	 doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-    doman doc/screen.1
-	 doinfo doc/screen.info*
-
-}
-
diff --git a/app-misc/screen/screen-3.9.9.ebuild b/app-misc/screen/screen-3.9.9.ebuild
deleted file mode 100644
index 34ad09cecec4..000000000000
--- a/app-misc/screen/screen-3.9.9.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens
-# $Header: /home/cvsroot/gentoo-x86/app-misc/screen.ebuild,v 1.2 2001/04/21
-# 19:25 CST blutgens Exp $
-
-#P=
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION=" Screen is a full-screen window manager that multiplexes a
-physical terminal between several processes"
-SRC_URI="ftp://ftp.uni-erlangen.de/pub/utilities/screen/${A}"
-HOMEPAGE="http://www.gnu.org/software/screen/"
-
-DEPEND="virtual/glibc
-        >=sys-libs/ncurses-5.2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-# Repair broken texi files so install-info don't barf on the dir entry
-	patch -p1 < ${FILESDIR}/screen-3.9.9-texi.patch
-}
-src_compile() {
-
-    try ./configure --prefix=/usr --host=${CHOST} \
-	--with-sys-screenrc=/etc/screen/screenrc \
-	--mandir=/usr/share --libexecdir=/usr/lib/misc
-    try emake
-
-}
-
-src_install () {
-
-    dobin screen
-    insinto /usr/share/terminfo
-    doins terminfo/screencap
-    insinto /etc/screen
-    doins etc/screenrc
-    dodoc README ChangeLog INSTALL COPYING TODO \
-	 doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-    doman doc/screen.1
-	 doinfo doc/screen.info*
-
-}
-
diff --git a/app-misc/xclip/xclip-0.05.ebuild b/app-misc/xclip/xclip-0.05.ebuild
index 3f11776ef795..492591a6f6b3 100644
--- a/app-misc/xclip/xclip-0.05.ebuild
+++ b/app-misc/xclip/xclip-0.05.ebuild
@@ -1,30 +1,27 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Grant Goodyear <grant@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xclip/xclip-0.05.ebuild,v 1.1 2001/06/07 06:03:57 grant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xclip/xclip-0.05.ebuild,v 1.2 2002/04/27 07:39:05 seemant Exp $
 
-#P=
-A=${P}.tar.gz
 S=${WORKDIR}/xclip
 DESCRIPTION="Command-line utility to read data from standard in and
  place it in an X selection for pasting into X applications."
-SRC_URI="http://www.mercuryit.com.au/~kims/xclip/${A}"
-HOMEPAGE=""
+SRC_URI="http://people.debian.org/~kims/xclip/${P}.tar.gz"
+HOMEPAGE="http://people.debian.org/~kims/xclip"
 
 DEPEND="virtual/x11"
 
 src_compile() {
 
-    try xmkmf 
-    try make
+	xmkmf || die
+	make || die
 
 }
 
 src_install () {
 
-    try make DESTDIR=${D} install
-    try make DESTDIR=${D} install.man
-    dodoc README INSTALL CHANGES
+	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install.man || die
+	dodoc README INSTALL CHANGES
 
 }
-