[gentoo-commits] gentoo-x86 commit in media-gfx/xli: xli-1.17.0-r2.ebuild xli-1.17.0-r3.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    09/09/04 12:21:48

  Modified:             xli-1.17.0-r2.ebuild xli-1.17.0-r3.ebuild
  Log:
  repoman issues
  (Portage version: 2.2_rc40/cvs/Linux x86_64)

Revision  Changes    Path
1.16                 media-gfx/xli/xli-1.17.0-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/xli/xli-1.17.0-r2.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/xli/xli-1.17.0-r2.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/xli/xli-1.17.0-r2.ebuild?r1=1.15&r2=1.16

Index: xli-1.17.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/xli/xli-1.17.0-r2.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xli-1.17.0-r2.ebuild	15 Jan 2008 18:33:24 -0000	1.15
+++ xli-1.17.0-r2.ebuild	4 Sep 2009 12:21:48 -0000	1.16
@@ -1,6 +1,6 @@
-# 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/xli/xli-1.17.0-r2.ebuild,v 1.15 2008/01/15 18:33:24 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/xli-1.17.0-r2.ebuild,v 1.16 2009/09/04 12:21:48 ssuominen Exp $
 
 inherit alternatives eutils
 
@@ -17,7 +17,7 @@
 RDEPEND="x11-libs/libXext
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/libpng-1.0.5
-	>=media-libs/jpeg-6b-r2
+	=media-libs/jpeg-6b*
 	app-arch/bzip2"
 DEPEND="${RDEPEND}
 	x11-proto/xextproto
@@ -28,8 +28,7 @@
 
 src_unpack() {
 	unpack ${A}
-
-	cd ${S}
+	cd "${S}"
 
 	sed -i Imakefile \
 		-e "/^DEFINES =/s/$/ -DHAVE_GUNZIP -DHAVE_BUNZIP2 /" \
@@ -49,8 +48,7 @@
 }
 
 src_compile() {
-	xmkmf || die "xmkmf failed."
-
+	xmkmf || die
 	emake CDEBUGFLAGS="${CFLAGS}" || die
 }
 
@@ -65,7 +63,7 @@
 	#dosym /usr/bin/xli /usr/bin/xsetbg
 
 	insinto /etc/X11/app-defaults
-	newins ${FILESDIR}/Xli.ad Xli || die
+	newins "${FILESDIR}"/Xli.ad Xli || die
 	fperms a+r /etc/X11/app-defaults/Xli
 }
 



1.4                  media-gfx/xli/xli-1.17.0-r3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/xli/xli-1.17.0-r3.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/xli/xli-1.17.0-r3.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/xli/xli-1.17.0-r3.ebuild?r1=1.3&r2=1.4

Index: xli-1.17.0-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/xli/xli-1.17.0-r3.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xli-1.17.0-r3.ebuild	15 Jan 2008 18:33:24 -0000	1.3
+++ xli-1.17.0-r3.ebuild	4 Sep 2009 12:21:48 -0000	1.4
@@ -1,8 +1,8 @@
-# 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/xli/xli-1.17.0-r3.ebuild,v 1.3 2008/01/15 18:33:24 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/xli-1.17.0-r3.ebuild,v 1.4 2009/09/04 12:21:48 ssuominen Exp $
 
-inherit alternatives eutils
+inherit eutils
 
 SNAPSHOT="2005-02-27"
 DESCRIPTION="X Load Image: view images or load them to root window"
@@ -17,14 +17,16 @@
 RDEPEND="x11-libs/libXext
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/libpng-1.0.5
-	>=media-libs/jpeg-6b-r2
+	=media-libs/jpeg-6b*
 	app-arch/bzip2"
 DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	x11-misc/imake
-	app-text/rman"
+	app-text/rman
+	!media-gfx/xloadimage
+	!<media-gfx/xli-1.17.0-r3"
 
-S="${WORKDIR}"/${PN}-${SNAPSHOT}
+S=${WORKDIR}/${PN}-${SNAPSHOT}
 
 src_unpack() {
 	unpack ${A}
@@ -48,40 +50,22 @@
 }
 
 src_compile() {
-	xmkmf || die "xmkmf failed."
-
-	emake CDEBUGFLAGS="${CFLAGS}" || die "emake failed."
+	xmkmf || die
+	emake CDEBUGFLAGS="${CFLAGS}" || die
 }
 
 src_install() {
-	dobin xli xlito
+	dobin xli xlito || die
+
+	dosym xli /usr/bin/xsetbg || die
+	dosym xli /usr/bin/xview || die
+
 	dodoc README README.xloadimage ABOUTGAMMA TODO chkgamma.jpg
 	newman xli.man xli.1
 	newman xliguide.man xliguide.1
 	newman xlito.man xlito.1
 
 	insinto /etc/X11/app-defaults
-	newins ${FILESDIR}/Xli.ad Xli
+	newins "${FILESDIR}"/Xli.ad Xli
 	fperms a+r /etc/X11/app-defaults/Xli
 }
-
-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
-}