Fixed collision on /usr/share/locale/locale.alias with sys-libs/glibc (bug #72386). Changed einstall -> emake DESTDIR=${D}

4 files changed, 16 insertions, 10 deletions

diff --git a/net-nds/gq/ChangeLog b/net-nds/gq/ChangeLog
index c12887624156..a011ba852f7c 100644
--- a/net-nds/gq/ChangeLog
+++ b/net-nds/gq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nds/gq
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/gq/ChangeLog,v 1.11 2004/10/26 19:48:31 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/gq/ChangeLog,v 1.12 2004/11/26 08:07:53 dragonheart Exp $
+
+  26 Nov 2004; Daniel Black <dragonheart@gentoo.org> gq-0.6.0.ebuild,
+  gq-0.7.0_beta2.ebuild, gq-1.0_beta1.ebuild:
+  Fixed collision on /usr/share/locale/locale.alias with sys-libs/glibc (bug
+  #72386). Changed einstall -> emake DESTDIR=${D}. Thankyou to Bruce Guenter
+  <bruceg@em.ca> for the bug report.
 
   26 Oct 2004; Tom Martin <slarti@gentoo.org> gq-1.0_beta1.ebuild:
   Resolved bug 68605 by regenerating config.sub and config.guess. Thanks to
diff --git a/net-nds/gq/gq-0.6.0.ebuild b/net-nds/gq/gq-0.6.0.ebuild
index a948409f8a5a..0a1c203bd881 100644
--- a/net-nds/gq/gq-0.6.0.ebuild
+++ b/net-nds/gq/gq-0.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/gq/gq-0.6.0.ebuild,v 1.10 2004/06/25 00:22:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/gq/gq-0.6.0.ebuild,v 1.11 2004/11/26 08:07:53 dragonheart Exp $
 
 DESCRIPTION="GTK-based LDAP client"
 SRC_URI="mirror://sourceforge/gqclient/${P}.tar.gz"
@@ -32,7 +32,8 @@ src_compile() {
 }
 
 src_install() {
-	einstall || die "Installation failed"
+	emake DESTDIR=${D} || die "Installation failed"
 
+	rm -f ${D}/usr/share/locale/locale.alias
 	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README* TODO
 }
diff --git a/net-nds/gq/gq-0.7.0_beta2.ebuild b/net-nds/gq/gq-0.7.0_beta2.ebuild
index 9b6cde2eb60a..ad4302a24e63 100644
--- a/net-nds/gq/gq-0.7.0_beta2.ebuild
+++ b/net-nds/gq/gq-0.7.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/gq/gq-0.7.0_beta2.ebuild,v 1.4 2004/06/25 00:22:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/gq/gq-0.7.0_beta2.ebuild,v 1.5 2004/11/26 08:07:53 dragonheart Exp $
 
 S=${WORKDIR}/${PN}-${PV/_/}
 DESCRIPTION="GTK-based LDAP client"
@@ -41,7 +41,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall || die "Installation failed"
-
+	emake DESTDIR=${D} || die "Installation failed"
+	rm -f ${D}/usr/share/locale/locale.alias
 	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README* TODO
 }
diff --git a/net-nds/gq/gq-1.0_beta1.ebuild b/net-nds/gq/gq-1.0_beta1.ebuild
index 0bfc7e3b506c..32ba44496a35 100644
--- a/net-nds/gq/gq-1.0_beta1.ebuild
+++ b/net-nds/gq/gq-1.0_beta1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/gq/gq-1.0_beta1.ebuild,v 1.5 2004/10/26 19:48:31 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/gq/gq-1.0_beta1.ebuild,v 1.6 2004/11/26 08:07:53 dragonheart Exp $
 
 S=${WORKDIR}/${PN}-${PV/_/}
 DESCRIPTION="GTK-based LDAP client"
 
 SRC_URI="mirror://sourceforge/gqclient/${PN}-${PV/_/}.tar.gz"
-RESTRICT="nomirror"
 HOMEPAGE="http://www.biot.com/gq/"
 IUSE="kerberos jpeg nls ssl"
 
@@ -60,7 +59,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall || die "Installation failed"
-
+	emake DESTDIR=${D} || die "Installation failed"
+	rm -f ${D}/usr/share/locale/locale.alias
 	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README* TODO
 }