Import Gentoo Prefix changes, convert to EAPI3, add keywords. bug 315513

Package-Manager: portage-2.1.8.3/cvs/Linux armv7l

3 files changed, 12 insertions, 19 deletions

diff --git a/app-editors/nano/ChangeLog b/app-editors/nano/ChangeLog
index adbe07da19d1..2ffed2ac24a6 100644
--- a/app-editors/nano/ChangeLog
+++ b/app-editors/nano/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/nano
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.248 2010/04/15 21:00:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.249 2010/04/15 22:43:48 darkside Exp $
+
+  15 Apr 2010; Jeremy Olexa <darkside@gentoo.org> nano-2.2.4.ebuild:
+  Import Gentoo Prefix changes, convert to EAPI3, add keywords. bug 315513
 
 *nano-2.2.4 (15 Apr 2010)
 
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 4f619b9d4951..c5a2b774f278 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX awk.nanorc 1504 RMD160 c932525ef987d799b255d308a1d354a56d3302a7 SHA1 22da2f05cabf3ae14a85352133315712816cab7b SHA256 c4fb326c9a11a56220dd8a566918c389794fd25e1cc3fda94c5925e5367977bb
 AUX css.nanorc 327 RMD160 a2d28f8f74c53b46d85d6ad986ad7dde7b3b7e50 SHA1 184cc1768789564d795398240ac814a9ae9f835d SHA256 0c2ea24540d9a87abb8c68e5eb042d396ec91a58cd53ea135b5548ea92c67913
 AUX gentoo.nanorc 2578 RMD160 65460270bc9e9e8041570124ccc510311761403d SHA1 e431cc0c034c354817a553a859e9256da1f31211 SHA256 82318b18536d3113238b91a2ed1d42aead0c6080492c540a4f8fdddccd8bbbd4
@@ -17,13 +14,6 @@ EBUILD nano-1.3.12-r1.ebuild 2047 RMD160 f096061b21b0af08aaf52a563a3c25844efb0b2
 EBUILD nano-2.0.9.ebuild 1967 RMD160 56bdf6d7f511b72b16393a2afa5755f704ab40b2 SHA1 7aa740fc850d913f4e227d0c2abed01c98576451 SHA256 9a58ab861d5909bc63dd5dc83d27c04bbf414de98d44cf64b56e825f699e9848
 EBUILD nano-2.1.10.ebuild 2129 RMD160 015db613f78790a707d6bc26f4ba8111704308ea SHA1 55c7a947776a0cd2be8ba467689c5ec81d435860 SHA256 1fa1ede2e5cc32ca4e9df85c0fe9d319463444e4f64e4bba787f182c12b32fb8
 EBUILD nano-2.2.3.ebuild 2140 RMD160 154e0736eb00ef0ff252ac75d161a8bb70291790 SHA1 50aa945e69c51a2f2ab46e3943fcf956ab70b214 SHA256 9ed5a6ab87b1da37798555134c251b06fa9591ccb680cf644ee10573b4e8e7f3
-EBUILD nano-2.2.4.ebuild 2140 RMD160 82b3c58d72fc51611130172949b4d84363314754 SHA1 73ab9f256ae7a574fac89ee782efef9b04c4e5d4 SHA256 3f7c25b2f3473bbb96f1cc243f5e3fc7bc4245047eb9bfbd6ef236c28b7f0013
-MISC ChangeLog 28905 RMD160 8ae8200fc4430ea22e963302ff3ea3955fed9669 SHA1 8175156490883c7e63107c42e82e1daa28f474a3 SHA256 c266093c31b861337c5c7983a2687b1c025c1ba487201a12231dbbabd0fa8e43
+EBUILD nano-2.2.4.ebuild 2364 RMD160 048ffe2a71be5d7def73a883864129bdaf8ac2e0 SHA1 1a9ccf409886e0b54a3fd235e45d491e6773ebd4 SHA256 46e72ff03164106fc5b1d55774e260f1d726860cc2836aa5feeafc4b671ea37b
+MISC ChangeLog 29052 RMD160 3485ce46a6fe697e812fca6d830422fc5ef4f560 SHA1 20c51800dd11a6d7f21f52557db6ceb7bea031f4 SHA256 1740d0037d5d91b9fb6906eb75abc55e9a65bad429fac33369c6ee3cdbd3b918
 MISC metadata.xml 1389 RMD160 92f10b7a951e99f48ddb2d0cc6eb4180e74a767b SHA1 9b951125e7fb7cd153eb7fd2693ef52846246b7a SHA256 6cd7072175c18846c4c3b0e16db652a5a29ba18eff7e8f2aeb28e7f74017ee0b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iF4EAREIAAYFAkvHfiAACgkQTwhj9JtAlp6bWwEAw3nxBCKN67/vM84JUrpoMxoJ
-pOHiS6uesJVWJ0QdNQABAMncfnBZeaj5ftt/Gqg+zgoBXJMtYCZvfGA/v/EdDWyh
-=GMYr
------END PGP SIGNATURE-----
diff --git a/app-editors/nano/nano-2.2.4.ebuild b/app-editors/nano/nano-2.2.4.ebuild
index 382e2da5344f..4a1790666741 100644
--- a/app-editors/nano/nano-2.2.4.ebuild
+++ b/app-editors/nano/nano-2.2.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.2.4.ebuild,v 1.1 2010/04/15 21:00:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.2.4.ebuild,v 1.2 2010/04/15 22:43:48 darkside Exp $
 
-EAPI=2
+EAPI=3
 inherit eutils
 if [[ ${PV} == "9999" ]] ; then
 	ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.nano-editor.org/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug justify minimal ncurses nls slang spell unicode"
 
 DEPEND=">=sys-libs/ncurses-5.2[unicode?]
@@ -43,7 +43,7 @@ src_configure() {
 		|| myconf="${myconf} $(use_with slang)"
 
 	econf \
-		--bindir=/bin \
+		--bindir="${EPREFIX}"/bin \
 		$(use_enable !minimal color) \
 		$(use_enable !minimal multibuffer) \
 		$(use_enable !minimal nanorc) \
@@ -72,9 +72,9 @@ src_install() {
 	insinto /usr/share/nano
 	local f
 	for f in "${FILESDIR}"/*.nanorc ; do
-		[[ -e ${D}/usr/share/nano/${f##*/} ]] && continue
+		[[ -e ${ED}/usr/share/nano/${f##*/} ]] && continue
 		doins "${f}" || die
-		echo "# include \"/usr/share/nano/${f##*/}\"" >> "${D}"/etc/nanorc
+		echo "# include \"/usr/share/nano/${f##*/}\"" >> "${ED}"/etc/nanorc
 	done
 }