Fix build problems due to missing CFLAGS, #544090; respect LDFLAGS, #340957

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 49 insertions, 19 deletions

diff --git a/x11-plugins/gkrellstock/ChangeLog b/x11-plugins/gkrellstock/ChangeLog
index e8edd9985d93..3efddf06dc82 100644
--- a/x11-plugins/gkrellstock/ChangeLog
+++ b/x11-plugins/gkrellstock/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/gkrellstock
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellstock/ChangeLog,v 1.15 2015/03/20 16:10:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellstock/ChangeLog,v 1.16 2015/03/24 19:42:04 jlec Exp $
+
+  24 Mar 2015; Justin Lecher <jlec@gentoo.org>
+  +files/gkrellstock-0.5-ldflags.patch, gkrellstock-0.5-r1.ebuild:
+  Fix build problems due to missing CFLAGS, #544090; respect LDFLAGS, #340957
 
 *gkrellstock-0.5-r1 (20 Mar 2015)
 
diff --git a/x11-plugins/gkrellstock/Manifest b/x11-plugins/gkrellstock/Manifest
index 27cf68887f34..8a364e9350b4 100644
--- a/x11-plugins/gkrellstock/Manifest
+++ b/x11-plugins/gkrellstock/Manifest
@@ -1,27 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX gkrellstock-0.5-ldflags.patch 412 SHA256 f54ecdd6dbcc485f269aae13b7996a7af0b04466ca2142d29efcc588b87f3a6c SHA512 626b1953988ce00d76270a779fcf7c5a2c0b599cd57ec0873ce2328c6cbbaaf7042cb8d608da9b0398205d29879c37ef9179edadf980ad5601b6eecac5fb7613 WHIRLPOOL e8f93a2dec5e95807fa24c153c513d7c5cadc2051fb90320e404b0bdbbcf02f8e288d2b92ecca5d1b10128a6e859f3b0611585174fc02a08fd6851b54e34369e
 DIST gkrellstock-0.5.tar.gz 22332 SHA256 1eb3ff7bf6fa8161f8b6cd8f99e3e5871fabd29866aad89ed3e2b7c2198f9e2a SHA512 8081bb1be1c640cd9853083fd22f931ffe6dbca359d86242df50e9684d2e856fd147692a716f7df4f4d496bc17e38988a40e7f547832dfaf61c2ed17d0b90b3d WHIRLPOOL 57b02ba1658fd5b587f703210cfda4364056d2336e695c107a45a258885bce8d8fe81f52b0603d1d25f0deea42a2431b4dbad6f3f5526e3474b858e145405a69
-EBUILD gkrellstock-0.5-r1.ebuild 681 SHA256 47a816bf7fc90c85edfa16d6e882162a5682437fe2b6d711459964d590fd39f8 SHA512 2322ec2be0c0659f1c0a6053475029e14bc0e10f65ac8e74761ce8eaaf1d900903f2ef6ac5ee1ad53de5a56abfc19bdc33e75042f87f66473d53dd7e3f4c5c4e WHIRLPOOL 89b8d6f6a77371c9f689e0f052a1ca5acd9755c49c872c3e561073c4e5e4ad7e17c0771b2787f6df11ce3df61377b6e82b9cd53a4b907cb5d573b0cb7dfcc808
+EBUILD gkrellstock-0.5-r1.ebuild 893 SHA256 3554f186a7acd240d0d1e4488a25bc0e55dfa283927080712321be91a71df6e9 SHA512 c7721d2c5b69749e0c30a115c595a62fda845bb40258c20202969d175e7e180c10fa586f0b68d51d3173c31c39f4125df9b86221c9524a8fde97532eded41341 WHIRLPOOL 58da8aef054bee8e36feebde4f45813af9d99f58927771a339374357e37eebb9776fd3dcdbb228e9ad07566b5583e603b1721cf86a686af6f838e1b6797a240d
 EBUILD gkrellstock-0.5.ebuild 629 SHA256 b7181a5d3d0c5dfc91ef881e05cf2e07b8ec93fd9ff88cc83b61f9d593c2e47a SHA512 9ec16c9d4ca40d71e7152ef1f59e3b79af27a2c380399d09e265704cabd4af0fed9ae58e4c1a4166b7074e191ad99854bc17baa11bfc662a1159a58d3a3a87cf WHIRLPOOL e6cbf295c53cc6bc960193145b7e2d68c0256aed57f986719e830a4ef8c48d93b36ff2a847452167f69871743378709406505b3df8cf843ca0547e4dece14ee0
-MISC ChangeLog 1853 SHA256 f9be898b1ad4a3ef2c72317279c6e7d56844fb27036a31f7041935c35ab96fd0 SHA512 a7eaf53fa080243e7afc0d3fe9cc4431ff7b94faf3a319f4bc7ef7730d34588000068145a6edaad970584685890172f2aeca1d0e569bc33625e7e0ca3ed50464 WHIRLPOOL 78ff994d84419e619e85a989c8cd69db998307827593b7766cabadf74b2af5463786dd9e869d6d513cdd33efb962955460d4db2c279e6791b2dd35934cf6fdff
+MISC ChangeLog 2046 SHA256 5cb2aeb97b4c0b31f5cb91f4b55a98607501689dd3a10725489241bc998d6f68 SHA512 1adfa6d02e82c99da6acabe8025aefba80a97de3b6acd8d2f3826f9686435e8418521e47017f267157b33683ed56351f58405ae2b86aae9c0c35de2b8267d9c1 WHIRLPOOL 3bff53787bed11db255e77dc5fbb7881704dcc6b19695701cd9d52263af82d364150bd16cbd1e96353e7193803a0c4a886b34a80367be7f53fec5d95f0cec989
 MISC metadata.xml 167 SHA256 0b161d83e9e7cad5a69cc5c2a23a5ba0fcac0d20751516b605dc232d9a2e7284 SHA512 cde6cff04d85c5663f874c4dde361195437c9f2262e7ef300a001b55151425b264d7439640d7d19c96d855d5cdb780c75ab5261b6028e8316cfabf66beaf65d4 WHIRLPOOL 7622a694f6d3fc1bc2f7fccd6a07ebb1e2f3dd00fecff580ebb272c86916c9a3953b5db0566097fbd993318bfecde00190baaf51b96b4ab8bdb96d3ca3d0c73b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVDEZ+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVEb4RXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirGxkQAJF+URKh59kNLMEevY1ZF1Qf
-Fh36c7Me397iDfpnyA5MPIqmbHHwO1SzLby/QHxna5bZU37+iDFstU3e6aLJuOGY
-7HxDyPtBDlYjR/GS/5MS8m3wuUI90wa2yDgC1SKCsoBoZJhua9x1gF+A2gFwNVZX
-5VE0b75JbRoNTvU/YbMVOaxewKgb8/TMYfRXvJSGExaSk3Y331uBQRoeYHAhri8P
-IAV/rTjVhktIkdhJSZYia4iN91w0Hjvqppm4XV2mF30HlEK4EdhUL9fz8QVToLEf
-EwZilQDeL3xjObBXGs4va2zQjqePmU7cKcvkU8waKQ23kGMBegw7E/p0X4kHfTJV
-pyLPjIt+KdfN9IZHxeQe7qyH9jgEEl6REyP5rLPI8IqUG9dsrlJ8G9r5vtsLgj8x
-twvMUkTavuEozR89zPZLpf4WIOrvzdnGHD6/RPp8rRI8ISipfPseqFlZdBYF07kh
-shMCyde0YMBhTKn7BcHGI/UPO1TTqhnNDST43yhYym3/+jIFbbW55ZYtEySKeJim
-dXGvwyyv9ieJX8F4HwalptPWAxL/Snir3Iecn1rO/GXprmkuAzy1xF2oNX+BWawD
-9U1kGNhXOZmyB3d0BPw0yr2gSd/1LtaoSsMsykW6aq6lX25f/zgmTd6DvdO1Gxo+
-7TRFVp6hLonQ9abi9o00
-=BES6
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir8R0QAJO045YpxK+4ZOE3u0P2P7iX
+jG+4pszO+vuFoHsw1gUUNCcnsdVLiCWq1MlG+JKqNQ99h1QzRvRT0Jvrf9CjEJ5M
+evPEhpXg+RDJrlXVn1BMmzETcZ+NxX6niI7MtgEYQVRKlHtFM8v9E/BsYCcBgIko
+UNLICZ2/oBTNmfCIu86tWtrnEcaGduRdWTYvcpa0CamdJEioGu241KhEg8gZBqre
+vtUpTmTTgzHB9nHxJQ5NnYO3EY2re93zB4j/EBy4ojm8sih8FJ6Iu0geQzx/R9s2
+sem4+jyBV9OVxmSjh+iexThCWn589uEx2nBn+HBB5HIFp9qxVwPn9/kgTdozPgaz
+er4q6kE+Z4yAebqCC/1m07uVNXdyDB5wTcFKzyV67UF6KaqBkh6uz1UjIw97hw8l
+S40rGSmPS1oI/mRXxH7J7SygNaxcIcLdU7qhJ1EF+jifwRGStMHx0IbXEx7E24Z7
+/e6WCYU3P05TxM/AhQwsZTgQnufFAZWDVYpaodOhwluBlELVKK+ibeqLzEE9CFIK
+zCM0P+RTcWh+CiAim927jjjvaX5edatFwFbtAZptKp6ZxAXcLE6O/0CCY+v/ZsNN
+G02JeQzlZNRjMWBOuvp5cg8Y9w+hHu19cZ58BsblRn7AjX6BK+QaefMpb9nREZnl
+mpid5jTT/tahLadDW2Em
+=0SUc
 -----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellstock/files/gkrellstock-0.5-ldflags.patch b/x11-plugins/gkrellstock/files/gkrellstock-0.5-ldflags.patch
new file mode 100644
index 000000000000..116e6ec3e4bd
--- /dev/null
+++ b/x11-plugins/gkrellstock/files/gkrellstock-0.5-ldflags.patch
@@ -0,0 +1,16 @@
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index eb26b17..79e4391 100644
+--- a/Makefile
++++ b/Makefile
+@@ -10,7 +10,7 @@ CC = gcc $(CFLAGS) $(FLAGS)
+ OBJS = gkrellstock.o
+ 
+ gkrellstock.so: $(OBJS)
+-	$(CC) $(OBJS) -o gkrellstock.so $(LFLAGS) $(LIBS) 
++	$(CC) $(LDFLAGS) $(OBJS) -o gkrellstock.so $(LFLAGS) $(LIBS) 
+ 
+ clean:
+ 	rm -f *.o core *.so* *.bak *~
diff --git a/x11-plugins/gkrellstock/gkrellstock-0.5-r1.ebuild b/x11-plugins/gkrellstock/gkrellstock-0.5-r1.ebuild
index 2f113631a521..1af6b89d415b 100644
--- a/x11-plugins/gkrellstock/gkrellstock-0.5-r1.ebuild
+++ b/x11-plugins/gkrellstock/gkrellstock-0.5-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellstock/gkrellstock-0.5-r1.ebuild,v 1.1 2015/03/20 16:10:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellstock/gkrellstock-0.5-r1.ebuild,v 1.2 2015/03/24 19:42:04 jlec Exp $
 
 EAPI=5
 
-inherit gkrellm-plugin toolchain-funcs
+inherit flag-o-matic gkrellm-plugin toolchain-funcs
 
 DESCRIPTION="Get Stock quotes plugin for Gkrellm2"
 HOMEPAGE="http://gkrellstock.sourceforge.net/"
@@ -16,11 +16,20 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:2
 	dev-perl/libwww-perl
 	dev-perl/Finance-Quote"
+DEPEND="virtual/pkgconfig"
 
 S=${WORKDIR}/${P/s/S}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags gtk+-2.0)
+	append-flags -fPIC
+}
+
 src_compile() {
 	emake CC=$(tc-getCC)
 }