Use ED instead of D as suggested by Agostino Sarubbo in bug #380061.

Package-Manager: portage-2.1.10.38/cvs/Linux x86_64

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index 57a7115a504a1c5b94e2fd93690cf01e10e0354a..3210173ffde69a8349b48dec4ba4066397457c80 100644 (file)
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/scite
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.122 2011/11/30 18:48:20 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.123 2011/11/30 19:05:10 nelchael Exp $
+
+  30 Nov 2011; Krzysztof Pawlik <nelchael@gentoo.org> scite-3.0.1.ebuild:
+  Use ED instead of D as suggested by Agostino Sarubbo in bug #380061.
 
 *scite-3.0.1 (30 Nov 2011)
 

diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 66db1ee27970178358dbd62c7c77b272b2350a2f..128c14edbba2dee7f2a7e8c9b4ba5e2d57b08954 100644 (file)
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -17,17 +17,17 @@ EBUILD scite-2.25.ebuild 2115 RMD160 c7b8f0e30ae65ce5aaab25eda2ee2028f6277ae4 SH
 EBUILD scite-2.26.ebuild 2165 RMD160 2f8eb1fad5bdfc5961b932f41dd93fd12950d3f1 SHA1 d9a0262990261f40e8a27cfb9cdc02e6b945e3f5 SHA256 3c1c23d95924a3a3771f076e85d8cfeae6977ceaab21e78811f5775d0e7dd034
 EBUILD scite-2.27.ebuild 2166 RMD160 c5411b60f0364b263a8c6734d33d3e80fabd0beb SHA1 5cb7eb855892b896e991c94b2d0564b9483e8cca SHA256 f7c92601930ec5b6239f4dd46bfe939cfcf48d51ac5617c5a7c9ed801df56d43
 EBUILD scite-2.28.ebuild 2119 RMD160 73441d17f34ec0b14be1eeef8f90280e25a19f03 SHA1 75c61da11b1a24f55d32edb6a1e2518e4989d1aa SHA256 839f8e0d19fd9e53c0ac99a60a146ba894f9dc3ba8d66133880e38bfd86c41f7
-EBUILD scite-3.0.1.ebuild 1994 RMD160 aa054229489e98ba394104e6693621d35ec5fb04 SHA1 3ae3accd4de26b02591f550a8b7b36924994f258 SHA256 85e74d7921ef95bafd037abbe93848171970863ba3824bf06397f79be24b19cd
-MISC ChangeLog 17657 RMD160 907fd5e3da4ed649efffa1c78baf9e54805c6880 SHA1 10f3b22acbebd5532be02aaa168f6444f506c00b SHA256 800c68e05d6ac8bbfbb87027d5da401eb9b5b2b8b4902e6173a95b7e14681627
+EBUILD scite-3.0.1.ebuild 1998 RMD160 91c3c6292c82f66fe431dfe26eff3fc3f260473a SHA1 f18f8e0d359fc7b98688d4791778a1cdfe989aed SHA256 6ce997a9b4013821fed86ab13c1eab777fee42aa49ba9d7836b6cea2ef1e0787
+MISC ChangeLog 17803 RMD160 6fb546fc94299dd7ebf9396e3244daf0a3ff9614 SHA1 895c64d675a37179ad250d2f3bcc540027f925a9 SHA256 c07ff1d6f3caf45cec978affa316cbf34854d5f832ebd60acb58a5f4884cc8e5
 MISC metadata.xml 209 RMD160 aad874f8991659f1214c1215c75597afc907d471 SHA1 9475be91874cb1e048ab26d4ea5ada17adcbc03f SHA256 ea9eb35c2edee74ca39c4e351322e86c12f3c37ce8a2bf1daa17ca5d07a578b7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO1np6AAoJEBZyv1r2qA5GTlcIAI2TC41GZUUti1b8kybjGHSN
-BTUW/jH9V14goj26gnDAaRejbR//2Jd0FxqYRfqTJYHXR+IfZrwKBpgpEbTtoqbK
-ZAajpoD1+YC1aFp09A8D5sJxbgxUoglN77tJXAZDFxkQToeuAwiwf9+WUEg+YoRf
-ZcpntozFtSbcIHIOXlP8pjClIzbCua3Z4L/LIJYqUNxdj5p++OLY3kk+llvtYMgw
-IYCvpcr7Cz9CE7Th6jrjFK6ENeUVvKKHOg/9NK0PnwCttUmy/2fmagi5FJ+X1xLQ
-fcX0eeVGHP8eV/PbH7Yfku18Rdsynp/+LL0+xEDpdgAmA+Ppa4M4BlPsewFZ604=
-=rRMd
+iQEcBAEBCgAGBQJO1n5rAAoJEBZyv1r2qA5G3UIH/2fvU7tOvXH/qgzi3uu9G9xP
+ixDBDAT7CLrolobjTMoq7yr3T5SuZrJQFlegGF+DhCBBOY7b36EZepqTGJs2cjNM
+9kQzS4QeHa1RiHdzQ35VuIbnaPiPxPsZXBI04ALqpPBJ3DQer84hLClSaLOsVAaw
+qAV8ZrZMi4C4OSWxWvv28gQ16Ca/XyZsMmFyjSCV6fFWqGwkWr8s4hiHfw/4Xyip
+2W7wbsm7tFERer2guU1W2GyStSyRf02DATNXLwrMtTSaik9ZPUkf6nVZvZERqzyF
+J5utxcHHydvnq2EbavDqlAEbEoVH4mqlTpfbzOSoDCMJi1NNZxFMbrHGrmFtcaQ=
+=YovQ
 -----END PGP SIGNATURE-----

diff --git a/app-editors/scite/scite-3.0.1.ebuild b/app-editors/scite/scite-3.0.1.ebuild
index f4794d7bfbaa0b201c5cf755c226e76c070948b9..8f1bfafc3abccfd7ced4fcdfee03e0488826b57a 100644 (file)
--- a/app-editors/scite/scite-3.0.1.ebuild
+++ b/app-editors/scite/scite-3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.0.1.ebuild,v 1.1 2011/11/30 18:48:20 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.0.1.ebuild,v 1.2 2011/11/30 19:05:10 nelchael Exp $
 
 EAPI="4"
 
@@ -66,14 +66,14 @@ src_install() {
        dodir /usr/bin
        dodir /usr/share/{pixmaps,applications}
 
-       emake prefix="${D}/usr" install
+       emake prefix="${ED}/usr" install
 
        # we have to keep this because otherwise it'll break upgrading
-       mv "${D}/usr/bin/SciTE" "${D}/usr/bin/scite" || die
+       mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
        dosym /usr/bin/scite /usr/bin/SciTE
 
        # replace .desktop file with our own working version
-       rm -f "${D}/usr/share/applications/SciTE.desktop"
+       rm -f "${ED}/usr/share/applications/SciTE.desktop"
        insinto /usr/share/applications
        doins "${FILESDIR}/scite.desktop"