Version bump. Removed old

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 41 insertions, 46 deletions

diff --git a/sys-apps/ed/ChangeLog b/sys-apps/ed/ChangeLog
index ad65503269a7..eae29525cc06 100644
--- a/sys-apps/ed/ChangeLog
+++ b/sys-apps/ed/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/ed
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ChangeLog,v 1.117 2015/05/27 12:34:17 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ChangeLog,v 1.118 2015/07/11 08:26:52 polynomial-c Exp $
+
+*ed-1.12 (11 Jul 2015)
+
+  11 Jul 2015; Lars Wendler <polynomial-c@gentoo.org> -ed-1.6.ebuild,
+  +ed-1.12.ebuild:
+  Version bump. Removed old.
 
   27 May 2015; Mikle Kolyada <zlogene@gentoo.org> ed-1.10.ebuild:
   arm stable wrt bug #545204
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index 02c820f43388..370d096b0a18 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX ed-1.5-build.patch 738 SHA256 5d6dcedc824c178cddc07b22aee1ee46cc1452803fe3d559b1f273bc2aaefa21 SHA512 4a13095360a850f18d814e317295f334699a878a88b63edbc5bb751b2eef56d68a8073f453bc146c674f91e20ca5a88e88b11282562906accc5673b29ea1dab2 WHIRLPOOL 5a3e7552218730c105930b491560526a972fb6f50f042dcdc69da78ce58c5a23f1458eb5f0493fdbd2cdae6be3e68a5e544a9d609d4a314102e030be58c7c993
 DIST ed-1.10.tar.lz 63717 SHA256 9540092c12309b2f4a294fdb8f5bd25f1ad5906a627518486e7733576a637e9a SHA512 b9c59de852609930d2a872f3d9af9ac12be8e80f3d2af49e3626cd909ba46ed4a4260844c636562cd479c5529a116055705260327f61304d8eaf88db6a60059a WHIRLPOOL 7130abba638202e06e078b9e60c9f83e6216fc0cd73891df08eda4a06044b9783a8f974b70dfb8452bdbc7c090bea3776c45b743e7a05bf9988197b51de729d8
 DIST ed-1.11.tar.gz 88303 SHA256 141dba3311e6295898d1b64e86263e40b8e85e3ab4ee4954859a3d3017511041 SHA512 09d86be3442a2e7eba0d1a008752a988324d3fa3e7870c3fffb00cb96f3433b3af3506105a1a6bc97a66754d994f6613c7a233417a4ddc32129adab055ad46b0 WHIRLPOOL 79fcb5436d0bcf9899a9af2abe3911000af136ff28e296ad9c26bf9717bf31f97a843700093baf598f4b5ed892f4a4cdfd2179381fcc4ecd53a55094877f7344
-DIST ed-1.6.tar.gz 86691 SHA256 211c67b0c4aae277d34b1c5f842db1952e468e5905142868e4718ac838f08a65 SHA512 efb9c4971a44e2baa46c60c607ab33e7f1c9460eb19dd37f68a7b570489578495f11848dd4791194660be31bc7a229f26f35409b6fc29150a7206de37a013723 WHIRLPOOL 81a5c9bd4b95f50b806ca2e40118ab052af382735fcd6853d6e6a3e0cb2a0bbffad2985cb4b4b694f88676bcb2a988b7361bc27b4ef345b388cc5a223702b61b
+DIST ed-1.12.tar.gz 87974 SHA256 f2c126d6ec1e5ccfccba05c749d6adf45e84011523ff0c31f595ad41ba892c84 SHA512 546a60e53b45c6416e91239a672e97ee9ce499e4c6d998e278a3870364da0b312e9d3fe681b1c11783d1f3342449502f3ac4d9eb3172c5e7c3b202d82fcb5989 WHIRLPOOL 6d94863786a06f508285ff7e4ca1dbf581a70a109359c101efefe22f070cb3bab46b16bea6110ed9d3894ccdab815ba8b3ff1119ccfe0cf6ea3257e1d27f0980
 EBUILD ed-1.10.ebuild 961 SHA256 b8aabaacc1530087e27709c8697efacd64417082f1043f9b78abd5937f861762 SHA512 371bb2df0d7a18dec7f72cdc4c56b9772ab8704c276b33ba503f2fee94a902ae323bebfe4f375b9c6912422604a97fd003bea254afda5e17bcb9779f7bcc7047 WHIRLPOOL f28ee666a2670b4a08468026ce46bb1efb984669b5d4b8e11e2302caf04fbc3c225fca1120064bdb002e1fc4af783c3ce629167f81d6f7f95c6111c05eb2e18a
 EBUILD ed-1.11.ebuild 1062 SHA256 11ff26770bb14b5b5df98e964c0496aa00215849450d269b54cd6e9de42abdbf SHA512 53a3759c0777ee16a57bddfecfff473171acc056da7af65cafa693d0a3730db491f40c9c572fcd894fea9a7b31420d9c35f2a6c733d3a0aaf105dc96134b63d3 WHIRLPOOL b5972b520a19b19a7bada849cedbb5d6d033bcdefb25dee214ff2fe1a7a9c8dc07b0057cac90cdebdd3690d6f25ce166e2f3e7e6141fbf3c9693bddef8569a54
-EBUILD ed-1.6.ebuild 942 SHA256 b867eb23b42800d0b3290f29b5b33b9ff9601b98695655376c25fde6b02f3cad SHA512 00af637860b11b3ae25e101ff4299eb23da47a24e8611bf248c2c431991f1d7f1fc693af0e2fff40b054633538087ba0769a9789baa2d94be9755661ad738373 WHIRLPOOL 66a744413d0b83ac63e8083f7a7de9a4fb9d810d6989f5a47d0a7a28a6586ea5e208868ff7890da8a762ef6de6d7b9a803ae769e2341932745614cb7553e2953
-MISC ChangeLog 13064 SHA256 7281a8161dbf8185f78de8c6f55389e6734f8e026c54666c7274ea47de1d789f SHA512 b19326c099c34980777f24836f0603919d0a50378eaa602ca7f0aac81bd65bd855411f7a70fbb65141214e57e4ab07a6e514880988d4bc4a4decf208da18a8e7 WHIRLPOOL f61a881f6655d7d012e67d91e5f48542dd01a319c4345cd90f6ea00aa260663cf001320c90699bdc316197055a7c282376d7162b9e9b88287437d27a05b80c21
+EBUILD ed-1.12.ebuild 1068 SHA256 dfa664a53d21fa6d738d3802e228df8931624da0844dc9641511e93ba90a0fdc SHA512 fa21a58c441651315e46bb0d15f1f460fc6ccfd11e8d1f064a2a636c8ac661dc74fc0e6618a4a95b7419ea726479e7cffb3d2dc7f05520b806db9a15b8d18bf0 WHIRLPOOL 3d59bd1dfbcc5ae7f0d14425b532ecea9a348e4249d93f3ebd81dd149dfffe57f7ba12430ed2e653e987c74e85abc8c7d1d6b208687612f2334945c5351146b4
+MISC ChangeLog 13212 SHA256 cd0c9b8dff1d09854a1cd76fe77c6b5f7db3912df6ad150e5433b5fd7fe14b52 SHA512 6429eddd1e40561c2a67141ac3509e5f11b65b02331e7198e258ab37a432ede607fca7395b03671f5ff94dc724d1fb77aca2a965fd300b72449f1183929312db WHIRLPOOL 6452e4a2dc21f26335814d229a72097c3aae55fae48e51cc80b87cd5c52086c650b0bd5dabe395b47c337059ca75c0494b63c731a5e8a9d386b291c36418e361
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iJwEAQEIAAYFAlVluVAACgkQG9wOWsQutdZ7IAP+OQLctgbkNR2Tg7XEVZcIGXO0
-1gihu46Q36YFa6Z83WAs7rndZFeZQ/FCiXoyvVme3+sza1mxDYhEUK1AFa4gxShN
-6d/MorIIFnRz+bDhrzOCDILq6/s1BfSNv9+wVoKxGGgOwNAxN4ZurosMiJF/T/c/
-I1HjwX8wEzd4yJ+GYfE=
-=DTMq
------END PGP SIGNATURE-----
diff --git a/sys-apps/ed/ed-1.12.ebuild b/sys-apps/ed/ed-1.12.ebuild
new file mode 100644
index 000000000000..a241b245b089
--- /dev/null
+++ b/sys-apps/ed/ed-1.12.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ed-1.12.ebuild,v 1.1 2015/07/11 08:26:52 polynomial-c Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Your basic line editor"
+HOMEPAGE="http://www.gnu.org/software/ed/"
+#SRC_URI="mirror://gnu/ed/${P}.tar.lz"
+# Using gzip instead -- the filesize diff is small and lzip uncommon #545344
+SRC_URI="http://fossies.org/linux/privat/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="sys-apps/texinfo"
+RDEPEND=""
+
+src_configure() {
+	# Upstream configure script is moronic.
+	econf \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${CFLAGS} ${LDFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		--bindir="${EPREFIX}/bin"
+}
diff --git a/sys-apps/ed/ed-1.6.ebuild b/sys-apps/ed/ed-1.6.ebuild
deleted file mode 100644
index f433dfd15e94..000000000000
--- a/sys-apps/ed/ed-1.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ed-1.6.ebuild,v 1.10 2014/01/18 03:08:43 vapier Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Your basic line editor"
-HOMEPAGE="http://www.gnu.org/software/ed/"
-SRC_URI="mirror://gnu/ed/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="sys-apps/texinfo"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5-build.patch
-}
-
-src_configure() {
-	tc-export CC
-	# custom configure script ... econf wont work
-	./configure \
-		--prefix="${EPREFIX}"/ \
-		--datadir="${EPREFIX}"/usr/share
-}