errno fixes

4 files changed, 88 insertions, 1 deletions

diff --git a/x11-misc/xloadimage/ChangeLog b/x11-misc/xloadimage/ChangeLog
index d31ce2830aab..1d87e9cded14 100644
--- a/x11-misc/xloadimage/ChangeLog
+++ b/x11-misc/xloadimage/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xloadimage
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xloadimage/ChangeLog,v 1.7 2002/12/16 22:48:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xloadimage/ChangeLog,v 1.8 2003/01/02 00:48:14 azarah Exp $
+
+*xloadimage-4.1-r1 (02 Jan 2003)
+
+  02 Jan 2003; Martin Schlemmer <azarah@gentoo.org> xloadimage-4.1-r1.ebuild :
+  Things should include errno.h, not define errno as external.  This fixes
+  issues with cvs glibc-2.3.2 ...
 
   16 Dec 2002; Aron Griffis <agriffis@gentoo.org> xloadimage-4.1.ebuild :
   Added ~alpha to KEYWORDS
diff --git a/x11-misc/xloadimage/files/digest-xloadimage-4.1-r1 b/x11-misc/xloadimage/files/digest-xloadimage-4.1-r1
new file mode 100644
index 000000000000..dc3b96321ad0
--- /dev/null
+++ b/x11-misc/xloadimage/files/digest-xloadimage-4.1-r1
@@ -0,0 +1 @@
+MD5 7331850fc04056ab8ae6b5725d1fb3d2 xloadimage.4.1.tar.gz 596021
diff --git a/x11-misc/xloadimage/files/xloadimage-4.1-include-errno_h.patch b/x11-misc/xloadimage/files/xloadimage-4.1-include-errno_h.patch
new file mode 100644
index 000000000000..f071d761617a
--- /dev/null
+++ b/x11-misc/xloadimage/files/xloadimage-4.1-include-errno_h.patch
@@ -0,0 +1,13 @@
+--- xloadimage.4.1/img.c.orig	2003-01-01 15:14:47.000000000 +0200
++++ xloadimage.4.1/img.c	2003-01-01 15:15:05.000000000 +0200
+@@ -14,9 +14,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <math.h>
++#include <errno.h>
+ #include "image.h"
+ 
+-extern int errno;
+ 
+ #define TRUE  1
+ #define FALSE 0
diff --git a/x11-misc/xloadimage/xloadimage-4.1-r1.ebuild b/x11-misc/xloadimage/xloadimage-4.1-r1.ebuild
new file mode 100644
index 000000000000..009e72b525dc
--- /dev/null
+++ b/x11-misc/xloadimage/xloadimage-4.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2002 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.1 2003/01/02 00:48:14 azarah Exp $
+
+IUSE="tiff jpeg png"
+
+inherit eutils
+
+MY_P="${P/-/.}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Xloadimage is a utility which will view many different types of images under X11"
+SRC_URI="ftp://ftp.x.org/R5contrib/${MY_P}.tar.gz"
+HOMEPAGE="http://gopher.std.com/homepages/jimf/xloadimage.html"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha"
+
+DEPEND="x11-base/xfree
+	tiff? ( media-libs/tiff )
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+
+	# Do not define errno extern, but rather include errno.h
+	# <azarah@gentoo.org> (1 Jan 2003)
+	epatch ${FILESDIR}/${P}-include-errno_h.patch
+	
+	cp Make.conf Make.conf.orig
+	sed -e "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf.orig >Make.conf
+}
+
+src_compile() {
+	chmod 0755 configure
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man || die "./configure failed"
+
+	make || die
+}
+
+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
+
+	mv xloadimage.man xloadimage.1
+	mv uufilter.man uufilter.1
+
+	doman xloadimage.1
+	doman 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
+}