Switch to use doenvd, mark 1.1 stable.

Package-Manager: portage-2.0.51.19

7 files changed, 19 insertions, 52 deletions

diff --git a/app-emulation/emul-linux-x86-qtlibs/ChangeLog b/app-emulation/emul-linux-x86-qtlibs/ChangeLog
index 2105513bffe8..10c3bb1a979b 100644
--- a/app-emulation/emul-linux-x86-qtlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-qtlibs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/emul-linux-x86-qtlibs
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog,v 1.8 2005/04/18 10:13:41 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog,v 1.9 2005/04/21 10:37:32 herbs Exp $
+
+  21 Apr 2005; Herbie Hopkins <herbs@gentoo.org>
+  +files/45emul-linux-x86-qtlibs, -emul-linux-x86-qtlibs-2.0.ebuild,
+  emul-linux-x86-qtlibs-2.1.ebuild, emul-linux-x86-qtlibs-1.1.ebuild:
+  Switch to use doenvd. Mark 1.1 stable.
 
 *emul-linux-x86-qtlibs-2.1 (18 Apr 2005)
 
diff --git a/app-emulation/emul-linux-x86-qtlibs/Manifest b/app-emulation/emul-linux-x86-qtlibs/Manifest
index 2ee78b3ff2cb..66b6e711cb69 100644
--- a/app-emulation/emul-linux-x86-qtlibs/Manifest
+++ b/app-emulation/emul-linux-x86-qtlibs/Manifest
@@ -1,18 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 977908b114cb4a613e702f0724c38cc0 emul-linux-x86-qtlibs-2.1.ebuild 883
-MD5 002191e293a20b96289771fce4fbae78 emul-linux-x86-qtlibs-2.0.ebuild 913
-MD5 17e5cc3645b1d4b2e375f57eb65499df ChangeLog 1438
+MD5 bef42a05dd77d22166059c242226ce26 emul-linux-x86-qtlibs-2.1.ebuild 626
+MD5 d63c1ae1e136261ff2192246f42f70fd ChangeLog 1668
 MD5 3d107142a3ec13f947ea538fdfe0f517 metadata.xml 290
-MD5 c3d4bb4ffd1413c37c44f6828df0f964 emul-linux-x86-qtlibs-1.1.ebuild 904
+MD5 3792e7deee7c605a2f0edd1e481cd07a emul-linux-x86-qtlibs-1.1.ebuild 903
 MD5 2e4054c8af077098840aa2e446cd77e3 files/digest-emul-linux-x86-qtlibs-1.1 79
-MD5 0d2187dbd99ba2755dd08dcf2d558226 files/digest-emul-linux-x86-qtlibs-2.0 79
 MD5 d0f7089d5f5d8d882e85353744b4db88 files/digest-emul-linux-x86-qtlibs-2.1 79
+MD5 c4e0363d341ecdf9a7297fe7d3654a84 files/45emul-linux-x86-qtlibs 121
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCY8pq2G5bA0cA/ScRAkCKAJ9txAJGBbaiU1xYC0RHC/mBlKmy2wCghRj3
-cY1uaUjOvADuKnVT9z12AEY=
-=d7TD
+iD8DBQFCZ4J92G5bA0cA/ScRApEbAKDAZp1qnw9lg0bo3YBaj3sAUL1g3gCfdMH9
+LrW6vXQBGoxPZZYbrApoM/c=
+=vy3N
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-1.1.ebuild b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-1.1.ebuild
index 86fab4d34f31..19b7010b01d7 100644
--- a/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-1.1.ebuild
+++ b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-1.1.ebuild,v 1.4 2005/02/09 09:51:01 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-1.1.ebuild,v 1.5 2005/04/21 10:37:32 herbs Exp $
 
 DESCRIPTION="QT 2/3 libraries for emulation of 32bit x86 on amd64"
 SRC_URI="mirror://gentoo/distfiles/emul-linux-x86-qtlibs-1.1.tar.bz2"
@@ -8,7 +8,7 @@ HOMEPAGE=""
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE=""
 
 DEPEND="virtual/libc
diff --git a/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-2.0.ebuild b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-2.0.ebuild
deleted file mode 100644
index a6693b82395d..000000000000
--- a/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-2.0.ebuild,v 1.2 2005/04/16 05:53:49 mr_bones_ Exp $
-
-DESCRIPTION="QT 2/3 libraries for emulation of 32bit x86 on amd64"
-SRC_URI="http://fermat.ma.rhul.ac.uk/~herbie/emul/emul-linux-x86-qtlibs-${PV}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* ~amd64"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=app-emulation/emul-linux-x86-xlibs-2.0"
-
-src_install() {
-	cd ${WORKDIR}
-
-	# create env.d entry
-	mkdir -p ${D}/etc/env.d
-	cat > ${D}/etc/env.d/45emul-linux-x86-qtlibs <<ENDOFENV
-	LDPATH=/emul/linux/x86/usr/qt/2/lib:/emul/linux/x86/usr/qt/3/lib
-	QTDIR=/emul/linux/x86/usr/qt/2:/emul/linux/x86/usr/qt/3
-ENDOFENV
-	chmod 644 ${D}/etc/env.d/45emul-linux-x86-qtlibs
-
-	cp -Rpvf ${WORKDIR}/* ${D}/
-}
diff --git a/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-2.1.ebuild b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-2.1.ebuild
index 8e668934c7b7..d79665fb950f 100644
--- a/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-2.1.ebuild
+++ b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-2.1.ebuild,v 1.2 2005/04/18 14:55:17 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-2.1.ebuild,v 1.3 2005/04/21 10:37:32 herbs Exp $
 
 DESCRIPTION="QT 2/3 libraries for emulation of 32bit x86 on amd64"
 SRC_URI="mirror://gentoo/emul-linux-x86-qtlibs-${PV}.tar.bz2"
@@ -15,15 +15,6 @@ RDEPEND="virtual/libc
 	>=app-emulation/emul-linux-x86-xlibs-2.0"
 
 src_install() {
-	cd ${WORKDIR}
-
-	# create env.d entry
-	mkdir -p ${D}/etc/env.d
-	cat > ${D}/etc/env.d/45emul-linux-x86-qtlibs <<ENDOFENV
-LDPATH=/emul/linux/x86/usr/qt/2/lib:/emul/linux/x86/usr/qt/3/lib
-QTDIR=/emul/linux/x86/usr/qt/2:/emul/linux/x86/usr/qt/3
-ENDOFENV
-	chmod 644 ${D}/etc/env.d/45emul-linux-x86-qtlibs
-
 	cp -RPvf ${WORKDIR}/* ${D}/
+	doenvd ${FILESDIR}/45emul-linux-x86-qtlibs
 }
diff --git a/app-emulation/emul-linux-x86-qtlibs/files/45emul-linux-x86-qtlibs b/app-emulation/emul-linux-x86-qtlibs/files/45emul-linux-x86-qtlibs
new file mode 100644
index 000000000000..f0922673c5d9
--- /dev/null
+++ b/app-emulation/emul-linux-x86-qtlibs/files/45emul-linux-x86-qtlibs
@@ -0,0 +1,2 @@
+LDPATH=/emul/linux/x86/usr/qt/2/lib:/emul/linux/x86/usr/qt/3/lib
+QTDIR=/emul/linux/x86/usr/qt/2:/emul/linux/x86/usr/qt/3
diff --git a/app-emulation/emul-linux-x86-qtlibs/files/digest-emul-linux-x86-qtlibs-2.0 b/app-emulation/emul-linux-x86-qtlibs/files/digest-emul-linux-x86-qtlibs-2.0
deleted file mode 100644
index a2e5c895d141..000000000000
--- a/app-emulation/emul-linux-x86-qtlibs/files/digest-emul-linux-x86-qtlibs-2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9727f7c000889e2e3206c1e2a3e8fee4 emul-linux-x86-qtlibs-2.0.tar.bz2 8693076