Respect optimization flags from the environment (and more) wrt #335218 by Diego Elio Pettenò. Link to libX11 instead of unsed libXpm for missing symbols like "XPutImage" wrt #368877 by Diego Elio Pettenò.

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

3 files changed, 50 insertions, 24 deletions

diff --git a/media-video/subtitler-yuv/ChangeLog b/media-video/subtitler-yuv/ChangeLog
index 32cd61f52862..abcc96bdd7bd 100644
--- a/media-video/subtitler-yuv/ChangeLog
+++ b/media-video/subtitler-yuv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/subtitler-yuv
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitler-yuv/ChangeLog,v 1.7 2010/07/21 00:01:16 sbriesen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitler-yuv/ChangeLog,v 1.8 2012/09/06 13:03:41 ssuominen Exp $
+
+  06 Sep 2012; Samuli Suominen <ssuominen@gentoo.org>
+  subtitler-yuv-0.6.5.ebuild:
+  Respect optimization flags from the environment (and more) wrt #335218 by
+  Diego Elio Pettenò. Link to libX11 instead of unsed libXpm for missing
+  symbols like "XPutImage" wrt #368877 by Diego Elio Pettenò.
 
   21 Jul 2010; Stefan Briesenick <sbriesen@gentoo.org>
   subtitler-yuv-0.6.5.ebuild:
diff --git a/media-video/subtitler-yuv/Manifest b/media-video/subtitler-yuv/Manifest
index 60ba14697832..1846c090f5a6 100644
--- a/media-video/subtitler-yuv/Manifest
+++ b/media-video/subtitler-yuv/Manifest
@@ -1,4 +1,18 @@
-DIST subtitler-yuv-0.6.5.tgz 568408 RMD160 525c41900b64e6e211997fb26596f04ee2671ff0 SHA1 f7b0fe1034abb842ddf159595e0a541c895334b3 SHA256 0e76f76b3cb001c0ed2d1ec51472fde594002c640960c489b6876dda549cbcc9
-EBUILD subtitler-yuv-0.6.5.ebuild 1150 RMD160 b50d5d18ec48361e3d297caa2064d2eb54766af4 SHA1 320053b8685838604277b5090b8b87d1c65aa5ee SHA256 d07fd934a46531f7106068373942973693d3c72f874b323514dcb2565bd2274d
-MISC ChangeLog 1370 RMD160 5129cd60fa8d4c49b0057ff0b437a57664da1539 SHA1 d00dcebdc1b5b7d66ea1755f1ddc24c450d69871 SHA256 b53a3a48241370ec1c93c1f8d4697599e1ebf34d36ce534318e52f32cdcacbc1
-MISC metadata.xml 221 RMD160 741d6758c0b24cb16a68c39b9816f1789c773479 SHA1 c1573cfc67d46e3a04ecb7d61e57428d68ae3439 SHA256 5192dd2d60e9e9df71729e0b5559c5bdd0be788dce9583ce6d995d99360af4dc
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST subtitler-yuv-0.6.5.tgz 568408 SHA256 0e76f76b3cb001c0ed2d1ec51472fde594002c640960c489b6876dda549cbcc9 SHA512 2dabb720896ef0c1bd54a7b8fdf4ab7097d95ba9e81608b713f4dd62c0f8a156d41bb7fe74cb5113f70f5390186fdea3e7d2e9add5d5748b677657ef356117dc WHIRLPOOL 86e6d959750551f08e69391d0d96efcd4f2321cbb4ed96af31ee4628c5fb1e15d3761b96df936ea0ebba6cbac4258ebe9dcf285e74d9661cbadb21faf00ff77a
+EBUILD subtitler-yuv-0.6.5.ebuild 958 SHA256 2ce825427ca596113d7e522a35b41f3b12b5e18e5fd51a902933611225a67b3d SHA512 9f5b96916c3d4dc45409fe8b6677501531b6a778ed4122b5419d98aaced34980a46d25862de19296c75b17bb230911ba04b093c4fc255baad57fae5f49f6884e WHIRLPOOL bf47799b4a436ab25c3a6662933910e329f0f2a62f6aa137f55d8dbb2c3d1372d34f321a8979e8385de882ba73adcfa78d57feec347715556b0794472a1bb418
+MISC ChangeLog 1669 SHA256 ec0b09af86d45e8e8e14961c6378eeaef40c5a1ec1f0ccb7bb5f84233a22ba03 SHA512 fccd3c3a4b34018f38a007f7eab575d006c7250cde2a899bf4b077f879cb1e1a1ad29643d5900d03434ab40d9afd5b66156e39b5f8c2fea67502ffe62fa07feb WHIRLPOOL 241ef32df8fd2895466ce907eda96c6f6542f582ff0c3b58419252126b079095fd8c69050485acf9e56f1c430c835fb052e5a4f06eaebacadf20bb9a7259cd2a
+MISC metadata.xml 221 SHA256 5192dd2d60e9e9df71729e0b5559c5bdd0be788dce9583ce6d995d99360af4dc SHA512 de34ca3f9a407b9efb103bc553d472806454bacb132436ade317c504db1f7882abad759c7363a27b89a84844478c9e2229c80c3a16a87ca08ed883b9d7887ccd WHIRLPOOL 1bcf597708a484e3c8fe8559e02ee32201b9a2b155ed2423e6ac8e9702fe74f7b65898dea5c2e9655b0ff74802485d20f8b3b11c5200d4b91aabfcd27a96395d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQSJ7wAAoJEEdUh39IaPFNQioH+wZGH5VChKvgSW1XUqMd3IDV
+HXGyndx1KzqvSQ5HhiZ3CBmNNhoChktoWXl2mQ5V+n8aCop9LjBqTcXvTVQA6h1S
+axYJyK8241LSoN80tOr9VZCXV12TW5oFlbcOo1RDeQ+E3lKyVpapEAIOGd2rRAnG
+TJzX9mKr2yAxEkWy306Ca+vr5AKun5d5z8VX2J4uNDPtxZCCDPqgfITM7warI7Us
+FEEdLYT7JFON1zIKyBjtRKMvgTI30KxPYUEmJrGV56jcO+B7vAMff367/HoFt+Nz
+BC0AKSxr0NyI6Uen5dlMQyBvgRIbSXwV5HIdo3ag9oioSbb7WYpCLU3qi/DBAfU=
+=tWdD
+-----END PGP SIGNATURE-----
diff --git a/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild b/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild
index fd61d46ade0d..4ac4a4d55a50 100644
--- a/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild
+++ b/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild
@@ -1,36 +1,42 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild,v 1.4 2010/07/21 00:01:16 sbriesen Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild,v 1.5 2012/09/06 13:03:41 ssuominen Exp $
 
+EAPI=4
 inherit toolchain-funcs
 
 DESCRIPTION="for mjpegtools for adding subtitles, pictures, and effects embedded in the picture"
-HOMEPAGE="http://home.zonnet.nl/panteltje/subtitles/"
-#SRC_URI="http://home.zonnet.nl/panteltje/subtitles/${P}.tgz"
-# using ibibio mirror as the webpage itself seems to be offline at the moment
-SRC_URI="http://www.ibiblio.org/pub/linux/apps/video/subtitler-yuv-0.6.5.tgz"
+HOMEPAGE="http://panteltje.com/panteltje/subtitles/"
+SRC_URI="mirror://gentoo/${P}.tgz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
-DEPEND="x11-libs/libXaw"
-RDEPEND="${DEPEND}"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXt"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	sed -i -e 's:/usr/X11R6:/usr:' \
-		-e 's:gcc:$(CC):g' \
-		Makefile || die "sed failed in Makefile"
+	sed -i \
+		-e '/^CFLAGS/s:= -O2:+=:' \
+		-e '/CFLAGS/s:gcc:$(CC):' \
+		-e 's:gcc -o:$(CC) $(LDFLAGS) -o:' \
+		-e 's:-L/usr/X11R6/lib/::' \
+		-e 's:-lXpm:-lX11:' \
+		Makefile || die
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+	tc-export CC
+	emake
 }
 
 src_install() {
-	dobin subtitler-yuv
-	dodoc CHANGES HOWTO_USE_THIS README README.COLOR.PROCESSOR README.PPML
+	dobin ${PN}
+	dodoc CHANGES HOWTO_USE_THIS README*
 	insinto /usr/share/${PN}
-	doins demo-yuv.ppml rose.ppm sun.ppm mp-arial-iso-8859-1.zip
+	doins *.{ppm,ppml,zip}
 }