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

5 files changed, 24 insertions, 18 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/Manifest b/net-nds/gq/Manifest
index 5a8777207ddb..9cace46d0104 100644
--- a/net-nds/gq/Manifest
+++ b/net-nds/gq/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e8ccbb7105138618f707f1860bc9d209 gq-1.0_beta1.ebuild 1495
-MD5 796ca60722115f9972056fc6368feef4 gq-0.7.0_beta2.ebuild 1172
-MD5 3c3807b56cded3474e828d7aa7bb2a1e ChangeLog 1471
+MD5 962dda95f7e0c9ea4e41df9a90a4a348 ChangeLog 1784
+MD5 62538b086b02864b7dc82b9bb8541d54 gq-0.6.0.ebuild 1048
+MD5 b01863a728cdc4f2460a48717654e895 gq-0.7.0_beta2.ebuild 1226
+MD5 828428296b89bdb3731f7e962fd4a108 gq-1.0_beta1.ebuild 1531
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 8e774b1aa7e1243f6dc3fffff793a11d gq-0.6.0.ebuild 993
 MD5 828702cac79a6948709d36296923765d files/digest-gq-0.6.0 60
-MD5 1c71ab6ac87b29de15f92040e36d9ada files/digest-gq-1.0_beta1 63
 MD5 2f8e4cb0c6e455c499981e4b9151fc08 files/digest-gq-0.7.0_beta2 65
+MD5 1c71ab6ac87b29de15f92040e36d9ada files/digest-gq-1.0_beta1 63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBfpxhCHk4+ZoBpvsRAgK/AJ0RuU1cT2Nc1a0vsFAZkqxR89Wt0gCgoTnQ
-wBmMRkEZt4mSmEGQ3aOwLYo=
-=/eOD
+iD8DBQFBpuRgmdTrptrqvGERAireAKCb0X3qafsV7SSE/wzLFnPnDKPpcQCggyxu
+p1yZ24EbMEc0JQQSnHHTC1I=
+=ipKz
 -----END PGP SIGNATURE-----
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
 }