Make rtf2pdf.sh accessible from /usr/bin (bug #347926 by James Broadhead) and fix parallel make (bug 385485 by Ian Delaney).

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 30 insertions, 14 deletions

diff --git a/app-editors/ted/ChangeLog b/app-editors/ted/ChangeLog
index 5a22bb8c6c78..91dd537ebb67 100644
--- a/app-editors/ted/ChangeLog
+++ b/app-editors/ted/ChangeLog
@@ -1,6 +1,11 @@
 # 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.46 2011/10/23 20:02:52 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ChangeLog,v 1.47 2012/03/03 19:18:38 pacho Exp $
+
+  03 Mar 2012; Pacho Ramos <pacho@gentoo.org> +files/ted-2.21-make.patch,
+  ted-2.21.ebuild:
+  Make rtf2pdf.sh accessible from /usr/bin (bug #347926 by James Broadhead) and
+  fix parallel make (bug 385485 by Ian Delaney).
 
   23 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -ted-2.20.ebuild,
   -files/ted-2.20-libpng14.patch:
diff --git a/app-editors/ted/Manifest b/app-editors/ted/Manifest
index 19822589088a..c2ac247111dc 100644
--- a/app-editors/ted/Manifest
+++ b/app-editors/ted/Manifest
@@ -2,18 +2,15 @@
 Hash: SHA1
 
 AUX ted-2.21-libpng15.patch 13063 RMD160 590afc9fd434a906fc68a4984942ba8895cced06 SHA1 ffdc9edbe8babc5b3cddb660ae5fa603620fb5c2 SHA256 90ecc97cad8c04d310f1dee7752ca320ccc37a30073b1cd82146224a32f720be
+AUX ted-2.21-make.patch 488 RMD160 075c06ae513ea7500422919500bd37a2c477c7da SHA1 2bc75817a9e8b4726d73e16da78b94fd97fde1f5 SHA256 9c973d85ba87662b9f98e81530222a20d5110dd0da11029cf7b36ee8619f546d
 DIST ted-2.21.src.tar.gz 3956815 RMD160 68935d62d216708c7053910f1261353176cf5c72 SHA1 303b15de1fe97e473c4b89a88b6e127ee81e07e9 SHA256 6c4bdebb8980fac00cf71ebc6c5f9bddee8ae13ab2327125dda95aa6948b363a
-EBUILD ted-2.21.ebuild 1200 RMD160 1cb003680cf9570815d94e5c9f992033f2abb90a SHA1 ca54d055fffcaa01c2a926177ebb453e0213ebaf SHA256 3cb61d64e49e7f4c66f960094e1821d222ae1c88016d0635f07ff079b3159121
-MISC ChangeLog 5479 RMD160 ce4877305236bbbf7bc5ca35faff9b22741af6fb SHA1 9fca338294dc4bdecb3f14025be5c0fd4c034d06 SHA256 ff0a74f1a5420418d787c93d3c48a51c966320c4aeb27d31dcb10afb5d312e62
+EBUILD ted-2.21.ebuild 1290 RMD160 0e1e73cae88207302c9ff122f948e39ba850114c SHA1 47a53afb9947d00014cd2313857654fd36174f87 SHA256 2d5930f0c0c7b49cc3963a815dda0b66a6e676d511b413b02f388435e4747b55
+MISC ChangeLog 5698 RMD160 8cc49d2713d59893bc3cf1eb2a9067ff52f612ed SHA1 a69acd5109d3e390712831b9e7615d832cd8a99a SHA256 17143151bab93bf31d1c7bdf0ad29df4b1e6bb3e116f42f6934dd1b3e6f290cd
 MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOpHK+AAoJEEdUh39IaPFNpF4H/iOM/hjBkCSg4x4W7EnCS7Rb
-JSmEYrDGg7TVbokRXo9nF3XvMFvzLTnfeYTNoQCBZj2JqtfTMdLKKHJJnidor1qD
-reYN/pqj/dPLC46woWCf1+0V/ufo7iCJuZ8CEwucNk2o55MowNYHYAD8xChCMRMW
-c8VfjE/qO/bPGjDmHD5y/P97xCdjKJIYjsexQo8ZkOHU4hpeV61D9+mmmMlokaj3
-SZOq7U59bM5OpOIaw4Zo20L0aFcwYkoXG1vOTOBOBEto/ljysYv9ODqHmdH5luTE
-P+D/jhbamQtOCX7vDm832rbUaUcmBCwgvi5Rpbj53IgxlMNe22B5mLxdD15tDLc=
-=IhFW
+iEYEARECAAYFAk9SbpMACgkQCaWpQKGI+9Tq2gCdEDj4aiD+1eiQEGbbYLbvo+0E
+K7AAnRjqShpdvB+Tm8jdDARABjFkD79B
+=YWC/
 -----END PGP SIGNATURE-----
diff --git a/app-editors/ted/files/ted-2.21-make.patch b/app-editors/ted/files/ted-2.21-make.patch
new file mode 100644
index 000000000000..2916c9505556
--- /dev/null
+++ b/app-editors/ted/files/ted-2.21-make.patch
@@ -0,0 +1,12 @@
+diff -ur Ted-2.21.orig//Makefile Ted-2.21/Makefile
+--- Ted-2.21.orig//Makefile	2009-10-16 23:20:58.000000000 +0800
++++ Ted-2.21/Makefile	2011-10-04 00:22:30.615975269 +0800
+@@ -198,7 +198,7 @@
+ 	: To install Ted, you can now run 'make install' AS ROOT
+ 
+ package.shared: tedPackage/makefile compile.shared
+-	cd tedPackage && make package.shared
++	cd tedPackage && $(MAKE) package.shared
+ 	:
+ 	: Dynamically linked package ready.
+ 	: To install Ted, you can now run 'make install' AS ROOT
diff --git a/app-editors/ted/ted-2.21.ebuild b/app-editors/ted/ted-2.21.ebuild
index 6ffdc44f9623..e53626bbb1ef 100644
--- a/app-editors/ted/ted-2.21.ebuild
+++ b/app-editors/ted/ted-2.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ted-2.21.ebuild,v 1.9 2011/10/23 16:07:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ted-2.21.ebuild,v 1.10 2012/03/03 19:18:38 pacho Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
@@ -26,6 +26,7 @@ S=${WORKDIR}/Ted-${PV}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-libpng15.patch
+	epatch "${FILESDIR}"/${P}-make.patch
 
 	sed -i -e 's|/Ted/|/share/Ted/|' \
 		"${S}"/appFrame/appFrameConfig.h.in \
@@ -54,4 +55,5 @@ src_install() {
 
 	dodir /usr/share
 	mv "${ED}"usr/Ted "${ED}"usr/share/Ted
+	dosym /usr/share/Ted/rtf2pdf.sh /usr/bin/rtf2pdf.sh
 }