Add fixes for Prefix, bug #361251

Package-Manager: portage-2.2.01.19074-prefix/cvs/Darwin i386

3 files changed, 92 insertions, 7 deletions

diff --git a/app-editors/nano/ChangeLog b/app-editors/nano/ChangeLog
index 577de8b7ae32..1cdc633b4ce7 100644
--- a/app-editors/nano/ChangeLog
+++ b/app-editors/nano/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/nano
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.264 2011/05/11 15:04:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.265 2011/08/29 18:08:00 grobian Exp $
+
+*nano-2.3.1-r1 (29 Aug 2011)
+
+  29 Aug 2011; Fabian Groffen <grobian@gentoo.org> +nano-2.3.1-r1.ebuild:
+  Add fixes for Prefix, bug #361251
 
 *nano-2.3.1 (11 May 2011)
 
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index df0242e49ea4..01bd3bf32d56 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX awk.nanorc 1504 RMD160 c932525ef987d799b255d308a1d354a56d3302a7 SHA1 22da2f05cabf3ae14a85352133315712816cab7b SHA256 c4fb326c9a11a56220dd8a566918c389794fd25e1cc3fda94c5925e5367977bb
 AUX css.nanorc 327 RMD160 a2d28f8f74c53b46d85d6ad986ad7dde7b3b7e50 SHA1 184cc1768789564d795398240ac814a9ae9f835d SHA256 0c2ea24540d9a87abb8c68e5eb042d396ec91a58cd53ea135b5548ea92c67913
@@ -17,13 +17,14 @@ 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.5.ebuild 2354 RMD160 e38e6e835f708fcd8a3f9719943c4905753c3f63 SHA1 6dd71ba6ca7c84057ba8696301efae357cde5bbb SHA256 bb2c6fe8fedf8e7396bd056ead857d816dfb1943f9fbc0a7e7e5701004a73991
+EBUILD nano-2.3.1-r1.ebuild 2366 RMD160 832f1661d41d47f36fd73f7ae5e7eb8db2a6473e SHA1 2fe8c5295dca9562a7850734cade8b4d569a7623 SHA256 e1571bf61af6a9bd64eb6be003f77a10e8e5fbd33febe90c057092c913cfddb0
 EBUILD nano-2.3.1.ebuild 2226 RMD160 ae8756b443a044a560b340c3d741890c9ffbc591 SHA1 61e251eaef429c373bb1d391045b28494c72ebb2 SHA256 c5d2d20d13bf85f122958c5f169701aeda6e388fe34e16e4989e759534a1f155
-MISC ChangeLog 30661 RMD160 275a5e215a8739116a88de4f4058612807fe811b SHA1 65e2ce14cdb722ecc12ce7256aeb45d9ce7b9567 SHA256 042923f5ed83fe159af3a9fd1108df03f72168c039f0cca07f204dca21136e31
+MISC ChangeLog 30803 RMD160 dc541a92d76c5a537489757880f55f89416c1b37 SHA1 d1e1aaa5989c78f40be5b36089be0bc7f107f266 SHA256 ea6b70c50902bb5a54340eef6dc3bdc7f40de603824ea544f027e0961555d749
 MISC metadata.xml 1389 RMD160 92f10b7a951e99f48ddb2d0cc6eb4180e74a767b SHA1 9b951125e7fb7cd153eb7fd2693ef52846246b7a SHA256 6cd7072175c18846c4c3b0e16db652a5a29ba18eff7e8f2aeb28e7f74017ee0b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iF4EAREIAAYFAk3KpYIACgkQaC/OocHi7JbV6gD/ZvXAjBee0LOi+GyRXdQlhlQy
-0qDgyviDIDJOSo3yWhsBAJjHA0RxOiE7HFCdkD4otbrt9KTfTnSOv7pmb13TbdCZ
-=IPu/
+iEYEARECAAYFAk5b1YUACgkQX3X2B8XHTolv7QCgk/LaZne3N0aXKxUSQkFTN6R5
+bq4An0SyUyeJNOIi5BrODAeAM/pEq9+k
+=HqtB
 -----END PGP SIGNATURE-----
diff --git a/app-editors/nano/nano-2.3.1-r1.ebuild b/app-editors/nano/nano-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..e3c58d263f26
--- /dev/null
+++ b/app-editors/nano/nano-2.3.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.3.1-r1.ebuild,v 1.1 2011/08/29 18:08:00 grobian Exp $
+
+EAPI="3"
+inherit eutils
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
+	inherit subversion
+else
+	MY_P=${PN}-${PV/_}
+	SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
+fi
+
+DESCRIPTION="GNU GPL'd Pico clone with more functionality"
+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 ~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?]
+	nls? ( sys-devel/gettext )
+	!ncurses? ( slang? ( sys-libs/slang ) )"
+
+src_prepare() {
+	if [[ ! -e configure ]] ; then
+		./autogen.sh || die
+	fi
+	# Prefix fix for odd ncursesw logic, bug #361251
+	sed -i -e "s:-I\(/usr/include/ncursesw\):-I${EPREFIX}\1:" configure || die
+}
+
+src_configure() {
+	local myconf=""
+	use ncurses \
+		&& myconf="--without-slang" \
+		|| myconf="${myconf} $(use_with slang)"
+
+	econf \
+		--bindir="${EPREFIX}"/bin \
+		$(use_enable !minimal color) \
+		$(use_enable !minimal multibuffer) \
+		$(use_enable !minimal nanorc) \
+		--disable-wrapping-as-root \
+		$(use_enable spell speller) \
+		$(use_enable justify) \
+		$(use_enable debug) \
+		$(use_enable nls) \
+		$(use_enable unicode utf8) \
+		$(use_enable minimal tiny) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO
+	dohtml doc/faq.html
+	insinto /etc
+	newins doc/nanorc.sample nanorc
+
+	dodir /usr/bin
+	dosym /bin/nano /usr/bin/nano
+
+	insinto /usr/share/nano
+	local f
+	for f in "${FILESDIR}"/*.nanorc ; do
+		[[ -e ${ED}/usr/share/nano/${f##*/} ]] && continue
+		doins "${f}" || die
+		echo "# include \"${EPREFIX}/usr/share/nano/${f##*/}\"" >> "${ED}"/etc/nanorc
+	done
+}
+
+pkg_postinst() {
+	einfo "More helpful info about nano, visit the GDP page:"
+	einfo "http://www.gentoo.org/doc/en/nano-basics-guide.xml"
+}