Removing automagic dependencies wrt bug 321995, with maekke blessing

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 91 insertions, 2 deletions

diff --git a/media-gfx/xloadimage/ChangeLog b/media-gfx/xloadimage/ChangeLog
index 2457e48e4bc0..123dc8c62023 100644
--- a/media-gfx/xloadimage/ChangeLog
+++ b/media-gfx/xloadimage/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/xloadimage
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/ChangeLog,v 1.51 2010/03/10 17:37:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/ChangeLog,v 1.52 2010/05/30 10:13:02 xarthisius Exp $
+
+*xloadimage-4.1-r11 (29 May 2010)
+
+  29 May 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  +xloadimage-4.1-r11.ebuild:
+  Removing automagic dependencies wrt bug 321995
 
   10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
   xloadimage-4.1-r10.ebuild:
diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index bc87266c64c0..1f480a3bd11e 100644
--- a/media-gfx/xloadimage/Manifest
+++ b/media-gfx/xloadimage/Manifest
@@ -4,8 +4,10 @@ AUX xloadimage-4.1-ldflags_and_exit.patch 775 RMD160 d7b44f8658d2e58aedf26c25c40
 AUX xloadimage-4.1-unaligned-access.patch 1730 RMD160 31d77d46308db7e1a44e391922db385217227281 SHA1 0fd44ef9e54c59884575f589a97c20cec7ec7657 SHA256 35548e5242d32f66e7175c090af4b2df5ee6f20f51d7e7f83a9f430af568f6c9
 AUX xloadimage-4.1-zio-shell-meta-char.diff 1372 RMD160 bdff2a42743659179ff9faaf7d2451d3d2c94678 SHA1 4ac943a7b4eb78d65577838b910628fa14fb84e6 SHA256 253064f5eebcd6c1c318b9637f1010657927b5f65be59581ef37523a50f3601e
 AUX xloadimage-gentoo.patch 8956 RMD160 f60ed7543ae72a598d37d665d2fd1b3e000a69c2 SHA1 4fa12fa375187f04f5f71dafe7b02b858273b050 SHA256 e03f0584b32a0be68f7baeb13df2ad29277ecdbb54baed0b5f878301122e0c30
+DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 RMD160 57f09f43e96fea7c103cd283aaea35245a44071a SHA1 2b577a1c230a99201a2cb48ba4b5d122f34da3c7 SHA256 addfd04c0a5667bb9c3f4ae6a9da35a443776086e30b84b2c3afa5eac161144a
 DIST xloadimage-4.1-gentoo.diff.bz2 41390 RMD160 63b160b968937d8c580c7876137263bdbaaa575d SHA1 6436b03b74429470b5491870706885dd7fe69f63 SHA256 dae93c4bd2955810252ff4dd5650386c34f82db8a7a1502c653bf965dad1632a
 DIST xloadimage.4.1.tar.gz 596021 RMD160 000271b40f58601cd1057b4e99c31a30da6e10af SHA1 0a8ee9b185702750706f68e4a34e086873f17690 SHA256 400bc7d84dcfb3265a7a1ce51819679dc3adaeda231514bd89b0f932b78ff5c4
 EBUILD xloadimage-4.1-r10.ebuild 2116 RMD160 3a0d8ef06f22f109d79f6b7807d2d8ab81dcbc9b SHA1 f30177fc6e207550ff9bd41b6e613353c66c2707 SHA256 3813a56560559c4e0bb1bbcf30a8e113cb9c0efb4ffeed30a017832b50bfc216
-MISC ChangeLog 8333 RMD160 924d27324564cbb844662491f84f9bd1f95fe140 SHA1 689aec2262e8a796bde0dc925e9b10ed0505e9ea SHA256 d14c01cf7c18dc0435cbb05ea14667260802154e791416002867d71c4cec8341
+EBUILD xloadimage-4.1-r11.ebuild 2213 RMD160 a2390be93b02d7128ca9de1e2563cb40b8d29f46 SHA1 7b2fd952957e3d46c030037fc211fb03618c5995 SHA256 90b53343ad8494d303ffa055d6dc7f7131d1ea2c6073398debdc0a7943f057f8
+MISC ChangeLog 8503 RMD160 f41e8ac5dd9618c0b3c4f05bcfcfc66f29d0af78 SHA1 bd4757279e8c169667acd3b8b11aea455c560358 SHA256 1adbd8eff043242adc117287f8884b2ac93a7b0f569394f8627b579f0f6ddf87
 MISC metadata.xml 163 RMD160 9cdda004bed83a887f4a756cb1550fab6ce563ce SHA1 bfc4f31690e338a159152dcd46d56ff7fd6b6e1b SHA256 212655100c50c4193072996553f15984b9788fb20fb4175efd2418b80d428564
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild
new file mode 100644
index 000000000000..d78397fd4413
--- /dev/null
+++ b/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild,v 1.1 2010/05/30 10:13:02 xarthisius Exp $
+
+EAPI=2
+inherit autotools eutils toolchain-funcs
+
+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/${P/-/.}.tar.gz
+	mirror://gentoo/${P}-gentoo-r1.diff.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="tiff jpeg png"
+
+RDEPEND="x11-libs/libX11
+	tiff? ( media-libs/tiff )
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg:0 )"
+DEPEND="${RDEPEND}
+	!media-gfx/xli"
+
+S=${WORKDIR}/${P/-/.}
+
+src_prepare() {
+	epatch "${WORKDIR}"/${P}-gentoo-r1.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
+
+	epatch "${FILESDIR}"/xloadimage-gentoo.patch
+
+	sed -i -e "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf || die
+	sed -i -e "s:^#include <varargs.h>:#include <stdarg.h>:" rlelib.c || die
+
+	# On FreeBSD systems malloc.h is a false header asking for fixes.
+	# On MacOSX it would require malloc/malloc.h
+	# On other systems it's simply unneeded
+	sed -i -e 's,<malloc.h>,<stdlib.h>,' vicar.c || die
+
+	epatch "${FILESDIR}"/${P}-unaligned-access.patch
+	epatch "${FILESDIR}"/${P}-ldflags_and_exit.patch
+
+	sed -i \
+		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
+		png.c || die
+
+	chmod +x configure
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	econf $(use_with jpeg) \
+		$(use_with png) \
+		$(use_with tiff)
+}
+
+src_install() {
+	dobin xloadimage uufilter || die
+
+	dosym xloadimage /usr/bin/xsetbg || die
+	dosym xloadimage /usr/bin/xview || die
+
+	insinto /etc/X11
+	doins xloadimagerc || die
+
+	newman xloadimage.man xloadimage.1 || die
+	newman uufilter.man uufilter.1 || die
+
+	echo ".so man1/xloadimage.1" > "${T}"/xsetbg.1
+	doman "${T}"/xsetbg.1 || die
+	newman "${T}"/xsetbg.1 xview.1 || die
+
+	dodoc README
+}