convert to multilib and remove useless || die and econf args

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 62 insertions, 16 deletions

diff --git a/dev-libs/libedit/ChangeLog b/dev-libs/libedit/ChangeLog
index 0e0c5f01d438..f2589a40b68b 100644
--- a/dev-libs/libedit/ChangeLog
+++ b/dev-libs/libedit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libedit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/ChangeLog,v 1.75 2013/06/18 12:02:14 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/ChangeLog,v 1.76 2013/08/22 12:58:42 aballier Exp $
+
+*libedit-20130611.3.1-r1 (22 Aug 2013)
+
+  22 Aug 2013; Alexis Ballier <aballier@gentoo.org>
+  +libedit-20130611.3.1-r1.ebuild:
+  convert to multilib and remove useless || die and econf args
 
 *libedit-20130611.3.1 (18 Jun 2013)
 
diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest
index 348dbe9e5499..b33d69281a4b 100644
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@@ -17,23 +17,14 @@ EBUILD libedit-20100424.3.0.ebuild 1263 SHA256 513f371ac17c22e3db210d3f1ed0acf45
 EBUILD libedit-20110709.3.0.ebuild 1292 SHA256 dd2fd00ebe02e54de6e23d4371dbd200497e5030718e104a3d09a63bf2e96123 SHA512 937b40cf4e21c79f20d8150b8e27d81562023a18f82e4cf76e6dca52af87b2bfc2cd83c1b995622fa2ee7236639b94ddd0bbe77e093cab2f5ba3fddc81fb2f4a WHIRLPOOL 3f7674c8718959c736e75d7588c14b6bc5b171a1d42144473707451708d9494f833b3d9a81e0940b630724a72115a491056d1c55550dde39e3a55e6362d52dc8
 EBUILD libedit-20120311.3.0-r1.ebuild 1361 SHA256 a36c5d02a07fa27c93a2454b39b5e070ccf56f378f58fd4349e60ff2d72f4730 SHA512 02a2f49670c0e745908d6f6fba175733c605eb79bf7bb0c286e73ad2fd05bd3e6d75afe46122d3de7ee1707d333e99946d93f86e28a6318292c645d568c94f81 WHIRLPOOL 960989aa3ffc054d9b5428550e2e2154ed180b6e5f308ab9907a85cd1e33635d7dab21e6c4783a8af66220c9820b5987704897952ee396f22f877903640273bd
 EBUILD libedit-20120311.3.0.ebuild 1303 SHA256 9697cc978408259a8a1022987a847995d0f62db09a6a5fea6ce5dc5a2ae769f3 SHA512 1028bd7c781f3b161b2cf9647f3cb802769a1a1ae7f9454d74760e2c97bf18dae46d92f1569278c8992676998bed8a3dd075a866a4a64507abb8ddb42c9f0d2c WHIRLPOOL 2826bc6be6322b37ae31b6c82c7271ce7b9c9aefd67c2cc145e872b579370c95fcbadba377c915cd7a0683baef3c0eaad84ce60fe59d130af9c33f1016d5820a
+EBUILD libedit-20130611.3.1-r1.ebuild 1444 SHA256 53019c7b9a2c15d283dff5a7f9f5378a3542aa381ff255066b4a149335a6322f SHA512 21e1e4853251cf3e548009f046a7750970d269930867dcb69ce23c8a7f0a6135849830c068e432d13ef42df5f5c325cf545dcd4c47a2b23c2946651e6d2e5d4e WHIRLPOOL d50d2da151cdc55370e17b643d6dcef80287505e910c8a0437b4faebaae3440eb14302061ed2227b81618cc1a02262319eeb646260118403e90666dc1185c27b
 EBUILD libedit-20130611.3.1.ebuild 1370 SHA256 8bce32af2940e5096ef482cc053aec6ce3282dc6aeaf379b35ef9e5f907220ca SHA512 eef041fa30b793b2aa4bbd445d56e3fce5bacbf633729bff44248e3e79aeb1430cdbc57e2dbcfb82d194ed0c378b8d6148f4291b71e6d3bf1c60809eedaa9a51 WHIRLPOOL bdbd865b93d43b29790889fcac6b4e85fc5ca12c5a46eb96e7640be9568c29f26ae51ca1c643006a5943412657fbcb30ba57ebd343b4fcaaf5da0b9be9ad837a
-MISC ChangeLog 9913 SHA256 899088904f105abbcbeedf22459b27767012248766d5229c54a6120968fd566f SHA512 8780cc79a8b0b2cbabd8ffbca8363392349adbc3dff4a79e7d44158fe336be27eceaebd4f385c853eba6d4a17b82d4cc2a0077d4bb63a6064402f13355f0240c WHIRLPOOL 590bce365c406f41bad9e9d5855d3bfa276110aa1496d79e6b55f4306837b7c03536153c03b475fe15f16489e97f9b98ff22dcf6e1ce72abeee03d48bb2fbe4d
+MISC ChangeLog 10107 SHA256 6e0a7898c5735665dc59248157686ef3373bad74b5cd28f03e8440d5efeb1269 SHA512 9ff0042d640b7aac0c09026165c2a439c7284224a74cb0631ac1e7dc4f53737430b048015ff50ef3a333d7a5c1cfd55283a8b9e4dd6f17d5c18e1544ba71652b WHIRLPOOL 9abc49be7c10d778dc2762ee12f625d65fcb02340d30da68f2bd66d9befaccc35e8c0940cf6e9946244d6bb008ed7407ab0d15c69c56803500e1c3a39788c5f5
 MISC metadata.xml 554 SHA256 31620c2c90ee411f950c9ccf31ec24c3734bcb4a9cc13c083a3214c05e62cdbd SHA512 69440f062aa5d586ba7c87eba204f63d2d8e7d4c34a0da94dc3f1ed0ea11a12b6ffa469c132f7f69b897bfdb92daa49d6550cb85d7530f6c7ef71386bfddb0f9 WHIRLPOOL 789b2b34afaa338db42eaac0bc20582eb9e831faf4e34ea76e8606343057edc854935d65be35b69726866d012516530366546a4e3707d2ffece19189f88cb8b5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRwExUAAoJEDYO1FT4VRUU/iMP/RP5bzfdwGVGuiMioGbs74Od
-il4AZV5DQ3+mGm6vZA5dQu07Ts4Aqd9yWy8eXbg2D79vCxPSzl+i/26GbuyTYHw2
-wMHNJs+tTQe9svq/OxV7RSl4vXzF0zFugyezsAYXrNanymsqQUnnDrRVR/m2g3Dy
-M6/r6vOGL8RGvSjEugZKvBIec1ZP7S7pA7IRWiScxk5+IHaBxg0QSd8QRgTVK/i1
-Wikkr+8/DAjQKYDNI6qkkveVpfi6w81R4Km60T8lKxb6bTuh52AOaw+RVYyupIod
-ml05wzs2MOCCYn3ALuqH9bLzSSd1fa6rJBPXk4mJDVBTGL4fWLgCCYfUS1halaAl
-W5MFEBW625gl99AMXUBEND5ChwLB/H+O/WjRJIPSMcR+McnwF3LFv5k74/7Rfx1Y
-31vaOVzF9oaXbqOqw8BMzu3szmX/iWsX+irhHf6EhVsaEeoJ9nMEDIV3s3rGMyZq
-5ztzPMwjEj44ooZKJH43Ig9ExGBKTVNLdLXOJV4j0/ToYS2IRJT4cchI6E25eJIh
-oO0U7cYDrOTTiANPtyTbhGHwO8B1PkrMzEZ7FGuJKrr+9YHn6ON+l/J6SSlsEbOc
-jAjwCcyzDI5IG8voAg6Bb925/xCshF6ufDudaSds5lX7FxfNqKdHN4vLB5VH9b7D
-4sESROsBN99l/34ymUYp
-=0i80
+iEYEAREIAAYFAlIWCwMACgkQvFcC4BYPU0of9gCgm2LU39omBX+N1DnCRPFbF8Z9
+aoUAn1RUphDAlySsiLjkgP9/19XbYhDU
+=Ljsi
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libedit/libedit-20130611.3.1-r1.ebuild b/dev-libs/libedit/libedit-20130611.3.1-r1.ebuild
new file mode 100644
index 000000000000..26be2ad7bbfe
--- /dev/null
+++ b/dev-libs/libedit/libedit-20130611.3.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20130611.3.1-r1.ebuild,v 1.1 2013/08/22 12:58:42 aballier Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs versionator base multilib-minimal
+
+MY_PV=$(get_major_version)-$(get_after_major_version)
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="BSD replacement for libreadline."
+HOMEPAGE="http://www.thrysoee.dk/editline/"
+SRC_URI="http://www.thrysoee.dk/editline/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="static-libs"
+
+DEPEND=">=sys-libs/ncurses-5.7-r5[static-libs?,${MULTILIB_USEDEP}]
+	!<=sys-freebsd/freebsd-lib-6.2_rc1"
+
+RDEPEND=${DEPEND}
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-ncursesprivate.patch"
+	"${FILESDIR}/${PN}-20100424.3.0-bsd.patch"
+	"${FILESDIR}/${PN}-20110709.3.0-weak-reference.patch"
+	"${FILESDIR}/${PN}-20120311-3.0-el_fn_sh_complete.patch"
+	)
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		--enable-widec \
+		--enable-fast-install
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && gen_usr_ldscript -a edit
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete
+}