Use alternatives.eclass to avoid conflict between xloadimage, see bug #26751

4 files changed, 40 insertions, 16 deletions

diff --git a/media-gfx/xli/ChangeLog b/media-gfx/xli/ChangeLog
index 10edfb10146b..81afe835ce7c 100644
--- a/media-gfx/xli/ChangeLog
+++ b/media-gfx/xli/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/xli
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/ChangeLog,v 1.6 2003/12/29 21:08:51 gmsoft Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/ChangeLog,v 1.7 2004/03/13 11:48:17 usata Exp $
+
+  13 Mar 2004; Mamoru KOMACHI <usata@gentoo.org> xli-1.17.0.ebuild,
+  files/Xli.ad:
+  Use alternatives.eclass to avoid conflict between xloadimage, see bug #26751
 
   29 Dec 2003; Guy Martin <gmsoft@gentoo.org> xli-1.17.0.ebuild :
   Added hppa to KEYWORDS and moved sed stuff in src_unpack.
diff --git a/media-gfx/xli/Manifest b/media-gfx/xli/Manifest
index b022abac7392..022f530cf6cd 100644
--- a/media-gfx/xli/Manifest
+++ b/media-gfx/xli/Manifest
@@ -1,4 +1,7 @@
 MD5 9ef51b8c90fa647309206fa9fa331b6f ChangeLog 814
-MD5 9f0e961e341ab94ce6a6e6cf53662f3b xli-1.17.0.ebuild 1838
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 9f0e961e341ab94ce6a6e6cf53662f3b xli-1.17.0.ebuild 1838
+MD5 2c73e334cd7575c4b5ae8f24ef09e31c xli-1.17.0-r1.ebuild 1928
+MD5 88664b266f34957e871e07457c605227 Xli.ad 123
 MD5 56c2673ad567dbf5ca2163c932571234 files/digest-xli-1.17.0 62
+MD5 56c2673ad567dbf5ca2163c932571234 files/digest-xli-1.17.0-r1 62
diff --git a/media-gfx/xli/files/Xli.ad b/media-gfx/xli/files/Xli.ad
new file mode 100644
index 000000000000..6c9a022e40b6
--- /dev/null
+++ b/media-gfx/xli/files/Xli.ad
@@ -0,0 +1,2 @@
+path=/usr/X11R6/include/X11/bitmaps /usr/X11R6/include/X11/images
+extension=.gif .jpg .rle .csun .msun .sun .face .xbm .bm
diff --git a/media-gfx/xli/xli-1.17.0.ebuild b/media-gfx/xli/xli-1.17.0.ebuild
index 7e9c0ce456b4..246265a150ec 100644
--- a/media-gfx/xli/xli-1.17.0.ebuild
+++ b/media-gfx/xli/xli-1.17.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/xli-1.17.0.ebuild,v 1.10 2004/01/07 20:23:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/xli-1.17.0.ebuild,v 1.11 2004/03/13 11:48:17 usata Exp $
+
+inherit alternatives
 
 S=${WORKDIR}/${P}
 DESCRIPTION="X Load Image: view images or load them to root window"
@@ -52,16 +54,29 @@ src_install() {
 	newman xli.man xli.1
 	newman xliguide.man xliguide.1
 	newman xlito.man xlito.1
-	dosym /usr/bin/xli /usr/bin/xview
-	dosym /usr/bin/xli /usr/bin/xsetbg
-
-	# is this even worth it? xrdb doesnt like this file; this is what
-	# their install does, though.
-	dodir /usr/X11R6/lib/X11/app-defaults
-	cp /dev/null ${D}/usr/X11R6/lib/X11/app-defaults/Xli
-	echo "path=/usr/X11R6/include/X11/bitmaps /usr/X11R6/include/X11/images" \
-		>> ${D}/usr/X11R6/lib/X11/app-defaults/Xli
-	echo "extension=.gif .jpg .rle .csun .msun .sun .face .xbm .bm" \
-		>> ${D}/usr/X11R6/lib/X11/app-defaults/Xli
-	chmod a+r ${D}/usr/X11R6/lib/X11/app-defaults/Xli
+	#dosym /usr/bin/xli /usr/bin/xview
+	#dosym /usr/bin/xli /usr/bin/xsetbg
+
+	insinto /etc/X11/app-defaults
+	newins ${FILESDIR}/Xli.ad Xli || die
+	fperms a+r /etc/X11/app-defaults/Xli
+}
+
+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() {
+	update_alternatives
+}
+
+pkg_postrm() {
+	update_alternatives
 }