Stop using internal ecompress function.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

2 files changed, 29 insertions, 42 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/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
-}