Version bump.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 92 insertions, 6 deletions

diff --git a/sys-apps/ed/ChangeLog b/sys-apps/ed/ChangeLog
index d9973d734d61..806aafb7cb5d 100644
--- a/sys-apps/ed/ChangeLog
+++ b/sys-apps/ed/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/ed
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ChangeLog,v 1.73 2008/12/31 09:38:42 vapier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ChangeLog,v 1.74 2009/02/02 05:00:27 vapier Exp $
+
+*ed-1.2 (02 Feb 2009)
+
+  02 Feb 2009; Mike Frysinger <vapier@gentoo.org> +files/ed-1.2-build.patch,
+  +ed-1.2.ebuild:
+  Version bump.
 
 *ed-1.1 (31 Dec 2008)
 
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index cd83bfd50158..edc21ebfcd7a 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -2,16 +2,19 @@
 Hash: SHA1
 
 AUX ed-1.0-build.patch 2911 RMD160 2ff1249fd69908d3bc0f3d708a2c4cd304a09f81 SHA1 2480398053859ba01dbbbec9d87bd7ed5cc4027c SHA256 aebd895045d6fb78887a616f73f7f4d74d3774fffba35b42c96cbafa5d9f9768
+AUX ed-1.2-build.patch 848 RMD160 c8497c533f5126f705b69cb07c76acbc850e1c71 SHA1 92568344dc9dafbac76aa17e3be390b2edc741db SHA256 331bdb9dab09633a35e83fe9f77fb6cb3246f8fa16a0ab9dccd981253a1ec334
 DIST ed-1.0.tar.bz2 68074 RMD160 d944beaba67e0f998e840628a7359415af35a42e SHA1 d826461be5247dab4db90055d5248e67eb6cad7c SHA256 f964b1800692d91fcab55e81b303b4a56ae9c311867278665b181a8fcd5f9357
 DIST ed-1.1.tar.bz2 68120 RMD160 0b79d8ade82a5eb1715cbe82e0088147b964a449 SHA1 0b66e79ebfe87eb80eb49be6ca7bb46df6f90e28 SHA256 a6ac771381ac2bdc4e9637c3e828d474640189f660a6540cf29d7b2940b03342
+DIST ed-1.2.tar.gz 89986 RMD160 98a46b8a3209476e824017102f200ed60525787d SHA1 6ebcbc76852a81886e2a85a973f375240bb3175e SHA256 7d1ad266e5f0cabcbbfff79706fda9ea59aa8e652cc8868b93cea9ef40011cca
 EBUILD ed-1.0.ebuild 894 RMD160 f75a6bfce08318d5c15153bbfbf045928551955e SHA1 afa5671be730fc8663a36d442d03b26b0a1b272f SHA256 88575e0dd590d0f19ce0c6aa9a444910a63fef752128bfd5b3561af77a81477c
 EBUILD ed-1.1.ebuild 906 RMD160 2fd53e33badb430337e84565d3f7470d2f81f872 SHA1 e8d85588234bae025168c9ec59578a56cf723f20 SHA256 587c8ccbb9b55383b6f3db08cd1b8c1a33946dac049b15f54e29473bffc5f390
-MISC ChangeLog 8052 RMD160 716a66a433559623cc5b906607f56ed53a94da4d SHA1 48b269a2e7380b561d745fe0d4a0327c1c8d4138 SHA256 2a11694c607d164c7f273bbf203b05f369a6bc89a65fa2f52f537fc3707839d4
+EBUILD ed-1.2.ebuild 905 RMD160 856db0ebcbcd1346b42e87bd532da0384f2a800b SHA1 4f22ebe3be405726abb443e389d24beb5be2a512 SHA256 628cef0718929e6f3b79803276258af41e6196fa55d648cd122f18a19e812236
+MISC ChangeLog 8187 RMD160 cfb283f6b65c9a2dd1730068277c8d561486d991 SHA1 b3e3490a7b1a7d5c192f2d05c1d33f29952b5a58 SHA256 ac1ce19733754b77afb1b5592ee60ff880ff30130ca74cc54ed6e7dc698610ea
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklbW7wACgkQn/5bYzqsSmGSigCeN4oPxnVBGUT7xAyDwKbrsbtX
-yOgAn3LDJ5HKOiJDPB9tV++cV46KEhPQ
-=nHwy
+iEYEARECAAYFAkmGffEACgkQn/5bYzqsSmGY9ACdGL0HAeHOYoConq77WY60UTPU
+g6UAniD5DEIA9wFTevlAY6o/E1nUcnx0
+=id46
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/ed/ed-1.2.ebuild b/sys-apps/ed/ed-1.2.ebuild
new file mode 100644
index 000000000000..ca12b1c1bf25
--- /dev/null
+++ b/sys-apps/ed/ed-1.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ed-1.2.ebuild,v 1.1 2009/02/02 05:00:27 vapier Exp $
+
+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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="sys-apps/texinfo"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.2-build.patch
+}
+
+src_compile() {
+	tc-export CC CXX
+	# custom configure script ... econf wont work
+	./configure \
+		--prefix=/ \
+		--datadir=/usr/share \
+		${EXTRA_ECONF} \
+		|| die
+	emake || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/sys-apps/ed/files/ed-1.2-build.patch b/sys-apps/ed/files/ed-1.2-build.patch
new file mode 100644
index 000000000000..b13702e17175
--- /dev/null
+++ b/sys-apps/ed/files/ed-1.2-build.patch
@@ -0,0 +1,38 @@
+http://lists.gnu.org/archive/html/bug-ed/2008-12/msg00001.html
+
+2007-04-16  Mike Frysinger  <vapier@gentoo.org>
+
+	* Do not set CC/CXX/CPPFLAGS/LDFLAGS to "" so that user can
+	  override if they so choose.
+	* Only set CFLAGS/CXXFLAGS if user did not specify any.
+
+--- ed-1.0/configure
++++ ed-1.0/configure
+@@ -24,12 +37,6 @@
+ mandir='$(datadir)/man'
+ sysconfdir='$(prefix)/etc'
+ program_prefix=
+-CC=
+-CXX=
+-CPPFLAGS=
+-CFLAGS='-Wall -W -O2'
+-CXXFLAGS='-Wall -W -O2'
+-LDFLAGS=
+ 
+ # Loop over all args
+ while [ x"$1" != x ] ; do
+@@ -106,6 +113,14 @@
+ 	esac
+ done
+ 
++# Defaults if the user did not select any
++if [ x"${CFLAGS+set}" != xset ] ; then
++	CFLAGS='-Wall -W -O2'
++fi
++if [ x"${CXXFLAGS+set}" != xset ] ; then
++	CXXFLAGS='-Wall -W -O2'
++fi
++
+ # Find the source files, if location was not specified.
+ srcdirtext=
+ if [ x"${srcdir}" = x ] ; then