old

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64

4 files changed, 14 insertions, 74 deletions

diff --git a/app-editors/ted/ChangeLog b/app-editors/ted/ChangeLog
index 4d16894b165b..5a22bb8c6c78 100644
--- a/app-editors/ted/ChangeLog
+++ b/app-editors/ted/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/ted
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ChangeLog,v 1.45 2011/10/23 16:07:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ChangeLog,v 1.46 2011/10/23 20:02:52 ssuominen Exp $
+
+  23 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -ted-2.20.ebuild,
+  -files/ted-2.20-libpng14.patch:
+  old
 
   23 Oct 2011; Raúl Porcel <armin76@gentoo.org> ted-2.21.ebuild:
   sparc stable wrt #385205
diff --git a/app-editors/ted/Manifest b/app-editors/ted/Manifest
index 4c8051a1a32e..19822589088a 100644
--- a/app-editors/ted/Manifest
+++ b/app-editors/ted/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ted-2.20-libpng14.patch 358 RMD160 3e09bd37e0a8c526ff0ac730dd412c035e24cf0f SHA1 a0151fa107b9f79a69268c28900418cec395eba7 SHA256 eb480afa89079204bf6f9c7bbe5d039b01a2b427284ffba69e5e7dceab5228ae
 AUX ted-2.21-libpng15.patch 13063 RMD160 590afc9fd434a906fc68a4984942ba8895cced06 SHA1 ffdc9edbe8babc5b3cddb660ae5fa603620fb5c2 SHA256 90ecc97cad8c04d310f1dee7752ca320ccc37a30073b1cd82146224a32f720be
-DIST ted-2.20.src.tar.gz 3903673 RMD160 e42fa339dcd8d7821c816bc2ed090617320dca70 SHA1 77f63421ca3e0472312febb39c9f2b1bf2a59a42 SHA256 5cc58ccb7bc38f7f0dacc1dfc836a43d35ac94a32cde54275b583b2e4d6f5335
 DIST ted-2.21.src.tar.gz 3956815 RMD160 68935d62d216708c7053910f1261353176cf5c72 SHA1 303b15de1fe97e473c4b89a88b6e127ee81e07e9 SHA256 6c4bdebb8980fac00cf71ebc6c5f9bddee8ae13ab2327125dda95aa6948b363a
-EBUILD ted-2.20.ebuild 1191 RMD160 cb8ce9f09290c9b0c67f2dbbb1ff09945ba34a3e SHA1 b75a00472c1326c365a2b5a2e8cc7781728935e9 SHA256 74c87c54ee065cf90316c13d48abe7682e91798af29c1d94bdf7eac0af1ee5e9
 EBUILD ted-2.21.ebuild 1200 RMD160 1cb003680cf9570815d94e5c9f992033f2abb90a SHA1 ca54d055fffcaa01c2a926177ebb453e0213ebaf SHA256 3cb61d64e49e7f4c66f960094e1821d222ae1c88016d0635f07ff079b3159121
-MISC ChangeLog 5364 RMD160 6284c3e1c44f27a0698660fcc85895feac2f70c7 SHA1 f96405c16dbebfdde406e57e1fb054bedd08a76f SHA256 3fd5dffd16795d3ef8c5ffab3b3dcad3fd9f178cdb203633e59955d312814fe2
+MISC ChangeLog 5479 RMD160 ce4877305236bbbf7bc5ca35faff9b22741af6fb SHA1 9fca338294dc4bdecb3f14025be5c0fd4c034d06 SHA256 ff0a74f1a5420418d787c93d3c48a51c966320c4aeb27d31dcb10afb5d312e62
 MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6kO9QACgkQuQc30/atMkAkTQCfUD1aM4VI0A78Rfe8c/db2l/w
-PwMAoIDzgfiAJvcqTrjEg9w067X4hn9j
-=DTtL
+iQEcBAEBAgAGBQJOpHK+AAoJEEdUh39IaPFNpF4H/iOM/hjBkCSg4x4W7EnCS7Rb
+JSmEYrDGg7TVbokRXo9nF3XvMFvzLTnfeYTNoQCBZj2JqtfTMdLKKHJJnidor1qD
+reYN/pqj/dPLC46woWCf1+0V/ufo7iCJuZ8CEwucNk2o55MowNYHYAD8xChCMRMW
+c8VfjE/qO/bPGjDmHD5y/P97xCdjKJIYjsexQo8ZkOHU4hpeV61D9+mmmMlokaj3
+SZOq7U59bM5OpOIaw4Zo20L0aFcwYkoXG1vOTOBOBEto/ljysYv9ODqHmdH5luTE
+P+D/jhbamQtOCX7vDm832rbUaUcmBCwgvi5Rpbj53IgxlMNe22B5mLxdD15tDLc=
+=IhFW
 -----END PGP SIGNATURE-----
diff --git a/app-editors/ted/files/ted-2.20-libpng14.patch b/app-editors/ted/files/ted-2.20-libpng14.patch
deleted file mode 100644
index 34fd241f5018..000000000000
--- a/app-editors/ted/files/ted-2.20-libpng14.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://repos.archlinux.org/wsvn/community/ted/trunk/PKGBUILD
-
---- bitmap/bmpng.c
-+++ bitmap/bmpng.c
-@@ -283,7 +283,7 @@
- static int bpPngiFromBitmap(	png_info *			pngi,
- 				const BitmapDescription *       bd )
-     {
--    png_info_init( pngi );
-+    png_create_info_struct( pngi );
-     pngi->width= bd->bdPixelsWide;
-     pngi->height= bd->bdPixelsHigh;
- 
diff --git a/app-editors/ted/ted-2.20.ebuild b/app-editors/ted/ted-2.20.ebuild
deleted file mode 100644
index ad0007ec273a..000000000000
--- a/app-editors/ted/ted-2.20.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ted-2.20.ebuild,v 1.9 2011/03/27 10:21:33 nirbheek Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="X-based rich text editor"
-HOMEPAGE="http://www.nllgg.nl/Ted"
-SRC_URI="ftp://ftp.nluug.nl/pub/editors/ted/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND="x11-libs/gtk+:2
-	>=media-libs/tiff-3.5.7
-	virtual/jpeg
-	>=media-libs/libpng-1.2.3"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/Ted-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng14.patch
-
-	sed -i -e 's|/Ted/|/share/Ted/|' \
-		"${S}"/appFrame/appFrameConfig.h.in \
-		"${S}"/Ted/tedConfig.h.in || die
-	mkdir lib || die
-}
-
-src_configure() {
-	for dir in appFrame appUtil bitmap docBuf ind Ted tedPackage
-	do
-		cd "${S}"/${dir}
-		econf --cache-file=../config.cache || die "configure ${dir} failed"
-	done
-}
-
-src_compile() {
-	emake package.shared || die "make package.shared failed"
-}
-
-src_install() {
-	cd "${S}"/tedPackage
-	RPM_BUILD_ROOT=${D} ./installTed.sh COMMON || die "install failed"
-
-	dodir /usr/share
-	mv "${D}"usr/Ted "${D}"usr/share/Ted
-}