mark stable for errno

4 files changed, 10 insertions, 68 deletions

diff --git a/x11-misc/xloadimage/Manifest b/x11-misc/xloadimage/Manifest
index aa238518f9f6..72adb0cee56e 100644
--- a/x11-misc/xloadimage/Manifest
+++ b/x11-misc/xloadimage/Manifest
@@ -1,6 +1,4 @@
-MD5 41b912168034f563de83df2e24251bcc xloadimage-4.1-r1.ebuild 1541
-MD5 61957b639baa788294130a3afd482b7a xloadimage-4.1.ebuild 1385
-MD5 ce0aebf7085d5e6317601b01b18b54a3 ChangeLog 1832
-MD5 c411c977cc7ae79dd96aad933980dbb2 files/xloadimage-4.1-include-errno_h.patch 303
 MD5 bad387ba03d0111a70dd7066ba97d5e5 files/digest-xloadimage-4.1-r1 140
-MD5 bad387ba03d0111a70dd7066ba97d5e5 files/digest-xloadimage-4.1 140
+MD5 c411c977cc7ae79dd96aad933980dbb2 files/xloadimage-4.1-include-errno_h.patch 303
+MD5 35cda94dac67c035eefaf98ba9547f6d xloadimage-4.1-r1.ebuild 1511
+MD5 ce0aebf7085d5e6317601b01b18b54a3 ChangeLog 1832
diff --git a/x11-misc/xloadimage/files/digest-xloadimage-4.1 b/x11-misc/xloadimage/files/digest-xloadimage-4.1
deleted file mode 100644
index 4036b1b2fd56..000000000000
--- a/x11-misc/xloadimage/files/digest-xloadimage-4.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7331850fc04056ab8ae6b5725d1fb3d2 xloadimage.4.1.tar.gz 596021
-MD5 8f5cc72c54ea730ba99026f006e71e10 xloadimage-4.1-gentoo.diff.bz2 41390
diff --git a/x11-misc/xloadimage/xloadimage-4.1-r1.ebuild b/x11-misc/xloadimage/xloadimage-4.1-r1.ebuild
index 8cfc70ae2463..41aa1d04adfa 100644
--- a/x11-misc/xloadimage/xloadimage-4.1-r1.ebuild
+++ b/x11-misc/xloadimage/xloadimage-4.1-r1.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xloadimage/xloadimage-4.1-r1.ebuild,v 1.8 2003/07/20 00:27:06 tester Exp $
-
-IUSE="tiff jpeg png"
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xloadimage/xloadimage-4.1-r1.ebuild,v 1.9 2003/07/28 11:29:02 vapier Exp $
 
 inherit eutils
 
 MY_P="${P/-/.}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Xloadimage is a utility which will view many different types of images under X11"
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="utility to view many different types of images under X11"
 HOMEPAGE="http://gopher.std.com/homepages/jimf/xloadimage.html"
 SRC_URI="ftp://ftp.x.org/R5contrib/${MY_P}.tar.gz
 	mirror://gentoo/${P}-gentoo.diff.bz2"
 
-SLOT="0"
 LICENSE="MIT"
-KEYWORDS="x86 ~sparc ~ppc alpha arm hppa amd64"
+SLOT="0"
+KEYWORDS="x86 sparc ppc alpha arm hppa amd64"
+IUSE="tiff jpeg png"
 
 DEPEND=">=sys-apps/sed-4.0.5
 	x11-base/xfree
@@ -38,7 +37,7 @@ src_unpack() {
 	sed -i "s:^#include <varargs.h>:#include <stdarg.h>:" ${S}/rlelib.c
 }
 
-src_install () {
+src_install() {
 	dobin xloadimage
 	dosym /usr/bin/xloadimage /usr/bin/xsetbg
 	dosym /usr/bin/xloadimage /usr/bin/xview
diff --git a/x11-misc/xloadimage/xloadimage-4.1.ebuild b/x11-misc/xloadimage/xloadimage-4.1.ebuild
deleted file mode 100644
index f4da758e3086..000000000000
--- a/x11-misc/xloadimage/xloadimage-4.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xloadimage/xloadimage-4.1.ebuild,v 1.11 2003/02/11 12:45:20 seemant Exp $
-
-inherit eutils
-
-IUSE="tiff jpeg png"
-
-MY_P=${P/-/.}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Xloadimage is a utility which will view many different types of images under X11"
-HOMEPAGE="http://gopher.std.com/homepages/jimf/xloadimage.html"
-SRC_URI="ftp://ftp.x.org/R5contrib/${MY_P}.tar.gz
-	mirror://gentoo/${P}-gentoo.diff.bz2
-	http://cvs.gentoo.org/~seemant/${P}-gentoo.diff.bz2"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="x86 sparc ppc alpha"
-
-DEPEND="x11-base/xfree
-	tiff? ( media-libs/tiff )
-	png? ( media-libs/libpng )
-	jpeg? ( media-libs/jpeg )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${WORKDIR}/${P}-gentoo.diff
-	
-	cp Make.conf Make.conf.orig
-	sed -e "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf.orig >Make.conf
-	
-	chmod +x ${S}/configure
-}
-
-src_install () {
-	dobin xloadimage
-	dosym /usr/bin/xloadimage /usr/bin/xsetbg
-	dosym /usr/bin/xloadimage /usr/bin/xview
-	dobin uufilter
-
-	insinto /etc/X11
-	doins xloadimagerc
-
-	newman xloadimage.man xloadimage.1
-	newman uufilter.man uufilter.1
-
-	dosym /usr/share/man/man1/xloadimage.1.gz /usr/share/man/man1/xsetbg.1.gz
-	dosym /usr/share/man/man1/xloadimage.1.gz /usr/share/man/man1/xview.1.gz
-
-	dodoc README
-}