Bring back missing patch. Bug #373453

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

3 files changed, 61 insertions, 7 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index caa8c1df4815..5f37c2146e22 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.181 2011/06/17 06:27:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.182 2011/08/11 09:13:00 hwoarang Exp $
+
+  11 Aug 2011; Markos Chandras <hwoarang@gentoo.org>
+  +files/fltk-1.1.9-share.patch:
+  Bring back missing patch. Bug #373453
 
 *fltk-1.3.0 (17 Jun 2011)
 
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index d39390aeb131..d8a91e083b65 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX FLTKConfig.cmake 1217 RMD160 5dd0903afe144b63c17dfb50b318b9d994787697 SHA1 2b09f60de6ae8ba1c1d625240e734b0413e643ca SHA256 cefffd18b6320c83aa546c953790b3dab9e4b99c0f43633b6994bdb7db69877e
 AUX fltk-1.1.10-includedir.patch 1163 RMD160 f3433f4e4b229e06897ee94be105dfc6e9076fa7 SHA1 55838393a5307e5be69dceb523a25e3c5d1dbde9 SHA256 0105911341d2d0a76fd051120128a34384daf27591a129c3c8b740fb6b5ccd9c
@@ -8,6 +8,7 @@ AUX fltk-1.1.9-conf-tests.patch 3086 RMD160 7fe5307dfe6b771dffdd28f87751a1529ca3
 AUX fltk-1.1.9-consts.patch 920 RMD160 efde1c9cefc08dd2829aadc536f55822f3ffd147 SHA1 d470b0a87839d6cde6ee5f0034a4cfdb6bb87d73 SHA256 366dd980d8d0bcfd0e5b1010316caf9103437976a8a10a0dd7b12943782dc082
 AUX fltk-1.1.9-desktop.patch 400 RMD160 c287cade8fe936db0334e1c364c8165512da9bd4 SHA1 44fd58b743698b97c38eea4bc1580a14d1c60916 SHA256 d1e073793cab3c5d7c88a95ae7e3e0e8e0014524bb53a1ae76f6526c41e4c191
 AUX fltk-1.1.9-glibc2.10-scandir.patch 736 RMD160 d2d28d50a5704bc64639a82ab2d7910220efd2b2 SHA1 72460b2d9e6e049b5e37fbe73930712e9ded8051 SHA256 bc7ba1695141ccd35908656e310577f10ac0a8866d8bdea6225e38970c82c7c7
+AUX fltk-1.1.9-share.patch 1892 RMD160 90f3939425ac31868a5cbbb01b66dcdb41a26e0d SHA1 12d37ac1dd6d2425b03ac964464049af3a048139 SHA256 3818c7b31ebc06e545facd409268dfb89dff8d889083b00f32fe79baafb7d56f
 AUX fltk-1.3.0-as-needed.patch 6090 RMD160 e3c1f74cf8c3cc61a0dfb15c1eec8ae7e7d0abe1 SHA1 c982a609c0b4086d242d2db1d7ea69d241cd9e37 SHA256 88944dc4e88c312dd84adaaa392bf4aedeb3e8ed0bb14ef8f0b2a5c8eac23158
 AUX fltk-1.3.0-conf-tests.patch 2862 RMD160 73f7318207cd8f6dc7f61ac85c6f27319d7c25cd SHA1 8a02cac9aeff7def4c459121b9f4488f2bdc05b5 SHA256 880037a60db7d120a87d9d90557cad4f0298de3e994621d00706d29b48585512
 AUX fltk-1.3.0-share.patch 2015 RMD160 7bd89b2b3dc35a80349b0ad71b378ebc2bb0eb1d SHA1 f1001ec8da36cc5e2f46ecafeff7ea2a35439179 SHA256 9d756497b7c880b8eac8ab4a60de279cad36ef0a932e6a4d6364117d5003502a
@@ -28,12 +29,22 @@ EBUILD fltk-1.1.9-r1.ebuild 3619 RMD160 2bd5e83b47f77db7c566dd2e3c353a63f74d5117
 EBUILD fltk-1.3.0.ebuild 3851 RMD160 62477c2590f66ec3e4b1f1b7013b0d7a45592649 SHA1 36a90ccf20ffeb5bd988b6ef61e1b6fba2ae13ff SHA256 69efd0b91729c31335876d76920c5d01ec639b4a598c85ba1e9c738ef9bda7a0
 EBUILD fltk-2.0_pre6970-r1.ebuild 2643 RMD160 3f2586e399d6d8d528458de6290474c6d8f71745 SHA1 231219d7b2a21b5f19fae8c1381add0c3d44b61c SHA256 30bcdb648e978978ea3f6e183efac6f02f008fbe345cde19c3257ad95e50a2d6
 EBUILD fltk-2.0_pre6970.ebuild 2499 RMD160 473e33748481ede77d977856375059b48994667e SHA1 d4b27ae1b48a9573104cd62ca106ad2ff9359acb SHA256 9151a4aaf72a4d22301cd16c8cf06461410a5121939162347da14c3106c4bffd
-MISC ChangeLog 25935 RMD160 05847038556dff7268e9b107c5317989f8856d8f SHA1 2de334eefeb8d45e6c814567cb0356c35aaaf8ec SHA256 1d3b382b98ad9056266ef7b33d40ca5b34a8d6105968a0c33d80ca8ccd5f29e8
+MISC ChangeLog 26066 RMD160 3070ea0373a9d731fdb4a8813b200fba6d3ae06b SHA1 fe4a1ff0d060883306deb8d9b121ce763c82ff4f SHA256 a03b687927f28e0869ebabf6e09e799d034d1181c7897867ec0dfafba0408cf5
 MISC metadata.xml 657 RMD160 24969ef07785738fc34d10c79dcc854d2a895ec3 SHA1 8afd06ddc3b01090acf0333f2ac41fc4a692f504 SHA256 f37b711686e55a32ab4a1e050ee6e98fbfd7e6d7839c53926b6103fff61c44b1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk36880ACgkQgAnW8HDreRbQTACfcFGUJXnqKfyRHFzyd0KG+V7G
-GF0An3aNkLASZvfdHMWALP34BQSQsr4F
-=AUH3
+iQIcBAEBCgAGBQJOQ50DAAoJEPqDWhW0r/LCl9IQAKFi2DfRe7a94hKoVFqEG/T0
+nATlpcO2sSF/AxAy2w8VH3vRb5nWfRHqFOP6xhA5gwJwljSLJ1lU4/D+XR2UyyW8
+pcBtxVC4a0hc8pikbD3HJOQbLsihXTcoPbT0+FbIAB8yjRlw2kaiHX1xjTZEInqZ
+bQPcZqm+hP+8Q+Q1ds49FI+c940nkS6zotcW1bNgH76ggk0mt0rqm2NOdnAGc02M
+RIEV1gOl79yenQzIpdK04jWfO7PzE7hCZCaLZbiMprU+u7EAWzUQuSxhFNUNUkRw
+UH5Zc7BvRLug7rpyE3E6M0tGET8KBPxUgNLHAGO+Gu7KccUucgy8Vs0+uxVAuC5P
+Qe2dRaufVJ0Q1CksnvT3DhV8iNfm4qKx6fSb84hT1Y/Ddzn9INT8W7QhNnlWVpvw
+glbM4EIs4VnKsUPla2NqimtPvVNOMLtrQ923QQLtvPtDU7V4lu+6i1hCsZkpov0M
+OeqyjCioF2AsryEGm1IIF/IK19GyfEPYZuR6TuEW9FneVxpGcmwg62/C+llTjnuL
+TKksyKIXMIblpwdWZssN4hBtIhAW1BXDTOl83AmsHi88iwMKg7LEO8e96tdcCB+g
+8y4/b7gaoTfWVy9H8VmGL6Q9VtU+1ynKfapqhYlODUHK49u4xY/hJ0qXd8xB0Wb2
+ZAfexQBhE/xLx3RZnpA3
+=hAFQ
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/fltk/files/fltk-1.1.9-share.patch b/x11-libs/fltk/files/fltk-1.1.9-share.patch
new file mode 100644
index 000000000000..60980bb9e50c
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.1.9-share.patch
@@ -0,0 +1,39 @@
+--- fluid/Makefile.orig	2010-03-29 22:41:01.828043805 -0500
++++ fluid/Makefile	2010-03-29 22:43:57.973828814 -0500
+@@ -84,16 +84,16 @@
+ 	$(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
+ 
+ install-linux:
+-	-$(INSTALL_DIR) $(DESTDIR)/usr/share/applications
+-	$(INSTALL_DATA) fluid.desktop  $(DESTDIR)/usr/share/applications
++	-$(INSTALL_DIR) $(DESTDIR)$(datadir)/applications
++	$(INSTALL_DATA) fluid.desktop  $(DESTDIR)$(datadir)/applications
+ 	for size in 16 32 48 64 128; do \
+-		if test ! -d $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; then \
+-			$(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; \
++		if test ! -d $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; then \
++			$(INSTALL_DIR) $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; \
+ 		fi; \
+-		$(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/fluid.png; \
++		$(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/fluid.png; \
+ 	done
+-	-$(INSTALL_DIR) $(DESTDIR)/usr/share/mimelnk/application
+-	$(INSTALL_DATA) x-fluid.desktop  $(DESTDIR)/usr/share/mimelnk/application
++	-$(INSTALL_DIR) $(DESTDIR)$(datadir)/mimelnk/application
++	$(INSTALL_DATA) x-fluid.desktop  $(DESTDIR)$(datadir)/mimelnk/application
+ 
+ install-osx:
+ 	echo Installing Fluid in $(DESTDIR)/Applications...
+@@ -111,9 +111,9 @@
+ 	$(RM) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
+ 
+ uninstall-linux:
+-	$(RM) $(DESTDIR)/usr/share/applications/fluid.desktop
+-	$(RM) $(DESTDIR)/usr/share/icons/hicolor/*/fluid.png
+-	$(RM) $(DESTDIR)/usr/share/mimelnk/application/x-fluid.desktop
++	$(RM) $(DESTDIR)$(datadir)/applications/fluid.desktop
++	$(RM) $(DESTDIR)$(datadir)/icons/hicolor/*/fluid.png
++	$(RM) $(DESTDIR)$(datadir)/mimelnk/application/x-fluid.desktop
+ 
+ uninstall-osx:
+ 	$(RM) -r $(DESTDIR)/Applications/fluid.app