use alternatives to install lemon

Package-Manager: portage-2.1_pre7-r5

4 files changed, 28 insertions, 22 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 44b95a3b16e4..b2655d0a85c2 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for dev-db/sqlite
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.106 2006/04/13 16:46:24 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.107 2006/05/04 00:20:38 arj Exp $
 
+  04 May 2006; Anders Rune Jensen <arj@gentoo.org> sqlite-3.3.5.ebuild, 
+  sqlite-2.8.16-r3.ebuild:
+  Use alternatives to install lemon binary. Thanks tove in #118429 for the
+  tip
+	
   13 Apr 2006; Anders Rune Jensen <arj@gentoo.org> sqlite-3.3.5.ebuild:
   Fix bug #129764 (compile with debug fails).
 
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 981738bc01db..54557b99dabe 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,6 +1,6 @@
-MD5 201a32254a410ec89ba80af9d4f7e53f ChangeLog 14882
-RMD160 a6066f28cdb7e2da044f926b5bd1d143e5e1726f ChangeLog 14882
-SHA256 ca024507925261f7b1f83a26f33ba753436a631fc645d83a74a989fe6f6b6ea5 ChangeLog 14882
+MD5 d28e31ed4aa54cca1f33383e884c8996 ChangeLog 15065
+RMD160 4b947b368f596faf8b3fea1a31dd343d588359ec ChangeLog 15065
+SHA256 a8b09ef68b7181cd254c1b80506399d33fa1d082141b68fdb0af72dd525470c7 ChangeLog 15065
 MD5 b4031f19b8a32fa2b9dd4dfaf4b57ad0 files/digest-sqlite-2.8.15 65
 RMD160 2c54ae05b013f8c53d0e417c07d9deb0f344e62c files/digest-sqlite-2.8.15 65
 SHA256 89ab258b0a2ec863541bac45f9230242ea584591acbbbdfde3894c24d5b373f1 files/digest-sqlite-2.8.15 65
@@ -70,9 +70,9 @@ SHA256 fae861b41efa07f6793fbe462149671b7922d3eb1af821a1da2b171339496459 sqlite-2
 MD5 7882c50758ad52018f654a9fe3c0f316 sqlite-2.8.16-r1.ebuild 1785
 RMD160 943345441d414fa1101af1422ddad3c4de93eb54 sqlite-2.8.16-r1.ebuild 1785
 SHA256 49304e796ce80b24a1a0fafc699ba88e07fd87966cc5417367ad417ab0c82aa9 sqlite-2.8.16-r1.ebuild 1785
-MD5 0004549fec7752b4669d3f4f7f550f7d sqlite-2.8.16-r3.ebuild 2379
-RMD160 87ddac58c5008d40bec1868391159d75978f8bb7 sqlite-2.8.16-r3.ebuild 2379
-SHA256 3fb5942f5b57f8254568e6153f74b88c06242992f8b01c4b6ed9dbab53c37091 sqlite-2.8.16-r3.ebuild 2379
+MD5 2cc3f32465548a99ee26409982a0c791 sqlite-2.8.16-r3.ebuild 2424
+RMD160 8d6e725044f990b9148e01757472f6abe9b0db29 sqlite-2.8.16-r3.ebuild 2424
+SHA256 681433c98bda8d1fcc71f95b55532537eb1e31eb70393d8e35db1ab8369ac8a0 sqlite-2.8.16-r3.ebuild 2424
 MD5 1041e20dae935fba256ac55ae98601b4 sqlite-3.2.1-r3.ebuild 1576
 RMD160 6658f320844f1a7041f824ae26c04fc894232dbd sqlite-3.2.1-r3.ebuild 1576
 SHA256 079e2b16556b66114cccd005c4f3568bcf7076713a0b977c418d3d2c18fcbfa8 sqlite-3.2.1-r3.ebuild 1576
@@ -82,6 +82,6 @@ SHA256 166b9954dc551ab0a1c806a295d2c3d3052d040188277f841a8a4aa5a27204a8 sqlite-3
 MD5 2769c18044507b4ef0029d805275c012 sqlite-3.3.4.ebuild 2138
 RMD160 7bbeaddb44666b10634f863b44d1046b8cd7efc7 sqlite-3.3.4.ebuild 2138
 SHA256 682ea3b53c05156b23f0701008b3b0d32e50f1cdd51ab76b8231ebc08cf3aa5e sqlite-3.3.4.ebuild 2138
-MD5 59a821f2772aebd580375e625e0e1d5d sqlite-3.3.5.ebuild 2060
-RMD160 45ae86152e1414b394df60a4207f1d2887143278 sqlite-3.3.5.ebuild 2060
-SHA256 f98668e6cdb9b5c2598818b723904333cbdfc3245c32284de672cf0b8819b447 sqlite-3.3.5.ebuild 2060
+MD5 c1f8cddf9e901888bfe854ca4565274b sqlite-3.3.5.ebuild 2104
+RMD160 2d82facfd7ed6ce00320a2c4e339738f88f9b446 sqlite-3.3.5.ebuild 2104
+SHA256 9dd7f5ccc8bfeca116212b8bc43aed07d64f2225590441a6c9acd4d96f042c44 sqlite-3.3.5.ebuild 2104
diff --git a/dev-db/sqlite/sqlite-2.8.16-r3.ebuild b/dev-db/sqlite/sqlite-2.8.16-r3.ebuild
index 5d8f4cc974d9..63765a8306f5 100644
--- a/dev-db/sqlite/sqlite-2.8.16-r3.ebuild
+++ b/dev-db/sqlite/sqlite-2.8.16-r3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r3.ebuild,v 1.1 2006/02/05 22:05:04 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r3.ebuild,v 1.2 2006/05/04 00:20:39 arj Exp $
+
+inherit eutils toolchain-funcs alternatives
 
-inherit eutils toolchain-funcs
 
 DESCRIPTION="SQLite: An SQL Database Engine in a C Library"
 HOMEPAGE="http://www.sqlite.org/"
@@ -16,6 +17,9 @@ IUSE="nls doc tcltk"
 DEPEND="doc? ( dev-lang/tcl )
 	tcltk? ( dev-lang/tcl )"
 
+SOURCE="/usr/bin/lemon"
+ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
+
 src_unpack() {
 	# test
 	if has test ${FEATURES}; then
@@ -88,10 +92,7 @@ src_install () {
 
 	make DESTDIR="${D}" install || die
 
-	if ! [ -e ${DESTDIR}/usr/bin/lemon ]
-	then
-	dobin lemon
-	fi
+	newbin lemon lemon-${SLOT}
 
 	dodoc README VERSION
 	doman sqlite.1
diff --git a/dev-db/sqlite/sqlite-3.3.5.ebuild b/dev-db/sqlite/sqlite-3.3.5.ebuild
index 922a0e669341..f37319ad5265 100644
--- a/dev-db/sqlite/sqlite-3.3.5.ebuild
+++ b/dev-db/sqlite/sqlite-3.3.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.3.5.ebuild,v 1.2 2006/04/13 16:46:24 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.3.5.ebuild,v 1.3 2006/05/04 00:20:39 arj Exp $
 
-inherit eutils
+inherit eutils alternatives
 
 DESCRIPTION="SQLite: An SQL Database Engine in a C Library"
 HOMEPAGE="http://www.sqlite.org/"
@@ -17,6 +17,9 @@ DEPEND="virtual/libc
 	doc? ( dev-lang/tcl )
 	tcltk? ( dev-lang/tcl )"
 
+SOURCE="/usr/bin/lemon"
+ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
+
 src_unpack() {
 	# test
 	if has test ${FEATURES}; then
@@ -82,10 +85,7 @@ src_test() {
 src_install () {
 	make DESTDIR="${D}" TCLLIBDIR="/usr/$(get_libdir)" install || die
 
-	if ! [ -e ${DESTDIR}/usr/bin/lemon ]
-	then
-	dobin lemon
-	fi
+	newbin lemon lemon-${SLOT}
 
 	dodoc README VERSION
 	doman sqlite3.1