Fixed b0rked endif. See bug #84072.

Package-Manager: portage-2.0.51-r15

4 files changed, 103 insertions, 7 deletions

diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index 13786f3342f1..d0280e98c63d 100644
--- a/media-gfx/xloadimage/Manifest
+++ b/media-gfx/xloadimage/Manifest
@@ -3,16 +3,19 @@ Hash: SHA1
 
 MD5 e1e8ff30f0997497fc1ad0e585954c43 xloadimage-4.1-r2.ebuild 2038
 MD5 1647539589b4f504417a39c8551c2e70 ChangeLog 4232
-MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 MD5 078fc3ab12c2f7564321ccdb25dda6f7 xloadimage-4.1-r1.ebuild 1987
-MD5 c411c977cc7ae79dd96aad933980dbb2 files/xloadimage-4.1-include-errno_h.patch 303
-MD5 bad387ba03d0111a70dd7066ba97d5e5 files/digest-xloadimage-4.1-r2 140
-MD5 bad387ba03d0111a70dd7066ba97d5e5 files/digest-xloadimage-4.1-r1 140
+MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
+MD5 6ee81cca4f4898c56e375950e430f4c6 xloadimage-4.1-r3.ebuild 2075
 MD5 9208b10866e00f1e47bb12a7f8bec04a files/xloadimage-4.1-zio-shell-meta-char.diff 1372
+MD5 bad387ba03d0111a70dd7066ba97d5e5 files/digest-xloadimage-4.1-r1 140
+MD5 bad387ba03d0111a70dd7066ba97d5e5 files/digest-xloadimage-4.1-r3 140
+MD5 bad387ba03d0111a70dd7066ba97d5e5 files/digest-xloadimage-4.1-r2 140
+MD5 fb91a22d37e6c6db534f1dc81add707e files/xloadimage-4.1-endif.patch 321
+MD5 c411c977cc7ae79dd96aad933980dbb2 files/xloadimage-4.1-include-errno_h.patch 303
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCJLtuugEuf3OQ0akRAhQYAJ9R41JTBATIqt8lwUdSRPevhLB/9QCePxie
-ALbSMX6djwM0pNGjKR/dG0Q=
-=u91E
+iD8DBQFCKZxsI7fK2cqeyXkRAuXfAKDufC2+4wy448cNqa+dZjBeeLAxVgCbB/CP
+uPw488W/SZCRUKLHpmZcurw=
+=hR4/
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/xloadimage/files/digest-xloadimage-4.1-r3 b/media-gfx/xloadimage/files/digest-xloadimage-4.1-r3
new file mode 100644
index 000000000000..4036b1b2fd56
--- /dev/null
+++ b/media-gfx/xloadimage/files/digest-xloadimage-4.1-r3
@@ -0,0 +1,2 @@
+MD5 7331850fc04056ab8ae6b5725d1fb3d2 xloadimage.4.1.tar.gz 596021
+MD5 8f5cc72c54ea730ba99026f006e71e10 xloadimage-4.1-gentoo.diff.bz2 41390
diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-endif.patch b/media-gfx/xloadimage/files/xloadimage-4.1-endif.patch
new file mode 100644
index 000000000000..df6f3e492190
--- /dev/null
+++ b/media-gfx/xloadimage/files/xloadimage-4.1-endif.patch
@@ -0,0 +1,11 @@
+--- xloadimage.4.1/copyright.orig	2005-03-04 12:58:27.347474256 +0100
++++ xloadimage.4.1/copyright.h		2005-03-04 12:58:42.913107920 +0100
+@@ -22,7 +22,7 @@
+ #ifndef __SABER__
+ #ifndef LINT
+ static char *Copyright= "Copyright 1989, 1993 Jim Frost";
+-#endif LINT
++#endif /* LINT */
+ #endif
+ #define _JIM_COPYRIGHT_
+ #endif
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r3.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r3.ebuild
new file mode 100644
index 000000000000..4fadee2eb2e3
--- /dev/null
+++ b/media-gfx/xloadimage/xloadimage-4.1-r3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/xloadimage-4.1-r3.ebuild,v 1.1 2005/03/05 11:48:02 pyrania Exp $
+
+inherit alternatives eutils flag-o-matic
+
+MY_P="${P/-/.}"
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="utility to view many different types of images under X11"
+HOMEPAGE="http://world.std.com/~jimf/xloadimage.html"
+SRC_URI="ftp://ftp.x.org/R5contrib/${MY_P}.tar.gz
+	mirror://gentoo/${P}-gentoo.diff.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 mips ppc ppc64 sparc x86 ppc-macos"
+IUSE="tiff jpeg png"
+
+RDEPEND="virtual/x11
+	tiff? ( media-libs/tiff )
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4.0.5"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${WORKDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${P}-zio-shell-meta-char.diff
+	epatch ${FILESDIR}/${P}-endif.patch
+
+	# Do not define errno extern, but rather include errno.h
+	# <azarah@gentoo.org> (1 Jan 2003)
+	epatch ${FILESDIR}/${P}-include-errno_h.patch
+
+	sed -i "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf
+	sed -i "s:^#include <varargs.h>:#include <stdarg.h>:" ${S}/rlelib.c
+
+	if use ppc-macos ; then
+		sed -i 's,<malloc.h>,<malloc/malloc.h>,' vicar.c
+		for f in $(grep zopen * | cut -d':' -f1 | uniq);do
+			sed -i "s:zopen:zloadimage_zopen:g" $f
+		done
+	fi
+
+	chmod +x ${S}/configure
+}
+
+src_install() {
+	dobin xloadimage
+	dobin uufilter
+
+	insinto /etc/X11
+	doins xloadimagerc
+
+	newman xloadimage.man xloadimage.1
+	newman uufilter.man uufilter.1
+
+	dodoc README
+}
+
+update_alternatives() {
+	alternatives_makesym /usr/bin/xview \
+		/usr/bin/{xloadimage,xli}
+	alternatives_makesym /usr/bin/xsetbg \
+		/usr/bin/{xloadimage,xli}
+	alternatives_makesym /usr/share/man/man1/xview.1.gz \
+		/usr/share/man/man1/{xloadimage,xli}.1.gz
+	alternatives_makesym /usr/share/man/man1/xsetbg.1.gz \
+		/usr/share/man/man1/{xloadimage,xli}.1.gz
+}
+
+pkg_postinst() {
+	use ppc-macos || update_alternatives
+}
+
+pkg_postrm() {
+	use ppc-macos || update_alternatives
+}