Stop using internal ecompress function.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

3 files changed, 31 insertions, 54 deletions

diff --git a/media-gfx/xloadimage/ChangeLog b/media-gfx/xloadimage/ChangeLog
index 41354efbf6d0..82112081b1f5 100644
--- a/media-gfx/xloadimage/ChangeLog
+++ b/media-gfx/xloadimage/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/xloadimage
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/ChangeLog,v 1.42 2008/11/17 21:12:46 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/ChangeLog,v 1.43 2009/09/04 11:14:38 ssuominen Exp $
+
+*xloadimage-4.1-r10 (04 Sep 2009)
+
+  04 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +xloadimage-4.1-r10.ebuild:
+  Stop using internal ecompress function.
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/xloadimage-4.1-unaligned-access.patch:
diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index 215b9d864f26..4173b3542137 100644
--- a/media-gfx/xloadimage/Manifest
+++ b/media-gfx/xloadimage/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xloadimage-4.1-endif.patch 321 RMD160 9d65994d8a2090bcf321bc48eaa4028263fe013f SHA1 4b3ed8fedb88c9ec9276a6bf2b48f372193f415c SHA256 a621ead90d893fd5d07d3034adf674d39235484f205198d47092e8e51bd71204
 AUX xloadimage-4.1-include-errno_h.patch 303 RMD160 a6125c8e94db89d348a4e358610bd195db044720 SHA1 94568ec6e2679c236b675754a49559f979e772e7 SHA256 705ea25d75585bd763b4330757266ac412ee30562e65b937722dad3e3141c56a
 AUX xloadimage-4.1-unaligned-access.patch 1730 RMD160 31d77d46308db7e1a44e391922db385217227281 SHA1 0fd44ef9e54c59884575f589a97c20cec7ec7657 SHA256 35548e5242d32f66e7175c090af4b2df5ee6f20f51d7e7f83a9f430af568f6c9
@@ -8,14 +5,7 @@ AUX xloadimage-4.1-zio-shell-meta-char.diff 1372 RMD160 bdff2a42743659179ff9faaf
 AUX xloadimage-gentoo.patch 8956 RMD160 f60ed7543ae72a598d37d665d2fd1b3e000a69c2 SHA1 4fa12fa375187f04f5f71dafe7b02b858273b050 SHA256 e03f0584b32a0be68f7baeb13df2ad29277ecdbb54baed0b5f878301122e0c30
 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 1880 RMD160 f33cf631e11d7575e62fc89df6b404ecf86929b5 SHA1 98b7bb62f760286bc3f8cbfb0bfe2b91ddfbe615 SHA256 c542303505623362aff53197700f4b915ebc15d8729c71a23ca0542fb2db6fa3
 EBUILD xloadimage-4.1-r4.ebuild 2217 RMD160 578d9e9b5d4eb1d24e5bceac91b8ca0af3c2301c SHA1 9a1d4eef6740b729679102e337085c104e0b4d5c SHA256 0effd77c9a4239964154be429060b3fd7a4224e4e4308a57f73a7755db9396aa
-EBUILD xloadimage-4.1-r5.ebuild 2352 RMD160 1d15eb982e303146d22b7f10f51f13dbf7b7d7d8 SHA1 b53f52960797e04623e55a206874eade55153fbb SHA256 213cad121273f9f5ebb63c5e428be4fc5a662e14c92257e826872969007210d9
-MISC ChangeLog 7154 RMD160 8d7f127a9708e65776e696f80c09b66985acae29 SHA1 cbab3e1386867463b4a95996ecfb78b9db8991b3 SHA256 5cbb64f8e5ecd058185c17a16431ff60402d9dd6eadac88e2d5995b05c19b6f1
+MISC ChangeLog 7316 RMD160 f9729132dbf59ff37c1720003b20d6ad9f2b4945 SHA1 f99411c99c3dd45c4607c8acf8385e2ed8ea29ea SHA256 ab4b945316c26e335bbe80e9c66d390b75453ee7cba7d26a07b3d100bc9b4d8a
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkh3lMACgkQAiZjviIA2Xg8+ACgzFqpHOtKR5eBzUuBHhnA8nch
-sS8AoLOTLEe35qZmP4IW2GGAZ2jor6wz
-=Rrh6
------END PGP SIGNATURE-----
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r5.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r10.ebuild
index 637d7b187495..741060ceb9ba 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r5.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r10.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/xloadimage-4.1-r5.ebuild,v 1.2 2008/01/15 18:37:57 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/xloadimage-4.1-r10.ebuild,v 1.1 2009/09/04 11:14:38 ssuominen Exp $
 
-inherit alternatives eutils toolchain-funcs
+EAPI=2
+inherit eutils toolchain-funcs
 
-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
+SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
 	mirror://gentoo/${P}-gentoo.diff.bz2"
 
 LICENSE="MIT"
@@ -21,11 +20,12 @@ RDEPEND="x11-libs/libX11
 	png? ( media-libs/libpng )
 	jpeg? ( media-libs/jpeg )"
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4.0.5"
+	!media-gfx/xli
+	!<media-gfx/xloadimage-4.1-r10"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+S=${WORKDIR}/${P/-/.}
+
+src_prepare() {
 	epatch "${WORKDIR}"/${P}-gentoo.diff
 	epatch "${FILESDIR}"/${P}-zio-shell-meta-char.diff
 	epatch "${FILESDIR}"/${P}-endif.patch
@@ -36,54 +36,35 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/xloadimage-gentoo.patch
 
-	sed -i "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf
-	sed -i "s:^#include <varargs.h>:#include <stdarg.h>:" "${S}"/rlelib.c
+	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
+	sed -i -e 's,<malloc.h>,<stdlib.h>,' vicar.c || die
 
 	epatch "${FILESDIR}"/${P}-unaligned-access.patch
 
-	chmod +x "${S}"/configure
+	chmod +x configure
 }
 
-src_compile() {
+src_configure() {
 	tc-export CC
-	econf || die "econf failed."
-	emake || die "emake failed."
+	econf
 }
 
 src_install() {
-	dobin xloadimage uufilter
+	dobin xloadimage uufilter || die
+
+	dosym xloadimage /usr/bin/xsetbg || die
+	dosym xloadimage /usr/bin/xview || die
 
 	insinto /etc/X11
-	doins xloadimagerc
+	doins xloadimagerc || die
 
 	newman xloadimage.man xloadimage.1
 	newman uufilter.man uufilter.1
 
 	dodoc README
 }
-
-update_alternatives() {
-	local mansuffix=$(ecompress --suffix)
-
-	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${mansuffix} \
-		/usr/share/man/man1/{xloadimage,xli}.1${mansuffix}
-	alternatives_makesym /usr/share/man/man1/xsetbg.1${mansuffix} \
-		/usr/share/man/man1/{xloadimage,xli}.1${mansuffix}
-}
-
-pkg_postinst() {
-	update_alternatives
-}
-
-pkg_postrm() {
-	update_alternatives
-}