Added media-gfx/splashutils-1.5.4.4-r5.ebuild with patch for lcms2

Package-Manager: portage-2.2.8-r1

4 files changed, 55 insertions, 16 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index cecf1f1..b9eacfc 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.222 2014/08/10 21:16:18 slyfox Exp $
 
+*splashutils-1.5.4.4-r5 (23 Aug 2014)
+
+  23 Aug 2014; AstroFloyd <AstroFloyd@gmail.com>
+  -splashutils-1.5.4.4-r4.ebuild, +splashutils-1.5.4.4-r5.ebuild,
+  +files/splashutils-1.5.4.4-llcms2.patch:
+  Added patch to link against lcms2
+
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   splashutils-1.5.4.4-r1.ebuild, splashutils-1.5.4.4-r2.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 0a7d96b..9f164af 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX initrd.splash-cmp-str-instead-of-int.patch 452 SHA256 a87df58a23b12eee65058f9bd326e354cdccf32048cbc8446b2ad72942da2f30 SHA512 9743953c07d010b98dfb827b750ab05c7c164da807f8d14b5159647b71220b1d58674f14c584aa2f207b175585aee4130a659dc246ea0af9984a1fb257346bb2 WHIRLPOOL cf3ce7d4516eee0e01052f7d3453c13a89e2ef49c50c26570237c8387f1ff42d3a0f19b98e815265323df6075e9795390ee8901d4758d508bd41398225ef397b
 AUX splashutils-1.5.4.3-daemon-exit-signal.patch 2764 SHA256 8d7d17ae6591f3de0bde18c537166710b1eac0f6aeb1507aecdf8d6a3d1553eb SHA512 f6d3c63d6d7eb58795a80fa66a1b96f37cf294034d9a135fd0c6a429b6e10771874b77f43cd49ef300fa2f44571660501ecc3a7998fe8ae35765c381043efcb6 WHIRLPOOL 0eece031b487ddd6adf7b74a285c4464a7513c737fcc2f6aa2e9fe4e27acb2306b4b546c6148161cc11c6c458df6baa6d70f9669a62aa673670ea450734c3ce1
 AUX splashutils-1.5.4.3-fix_rc_var.patch 1084 SHA256 c51b29f3c6191ac6259db52f56050a34872f07a78463a1ac1e4fbaf89d2f81d8 SHA512 53522bcaeff5c2add29336d8e997e9725c5dd5e13b3f207f6de78b9d16da381954f9f55d2cf497e39a8f621b8566057a6b2540c60a95bdf858995c7211e5ac86 WHIRLPOOL 16d7f1600f42c33ea9c383b9691f17b25a35377493814c6080fafe0f6234bd2c52e9221acfa5fee5d21dc525385c1b0219dc588a4c144b7e2d06a1d4d7f0d4ca
@@ -16,6 +13,7 @@ AUX splashutils-1.5.4.3-splash_util.patch 1335 SHA256 25b64a8bcb49f660a18dbd30bb
 AUX splashutils-1.5.4.4-bzip2.patch 1539 SHA256 9596a410eb5fcadab850ac8f1d54c14d60287333a204212cfcdb1dc2dfa608ac SHA512 c42a967361b4ebe9673eb41cb3d8d120edf95708892422bed0b2a46ea501d852c6c43b9405c90b69469a9b0eb07a5159e1547d168ef04b0de8a6c7bae0651317 WHIRLPOOL 4f28bec7ffac7caa4b5fc8e931ae579bf8041b8fcf6c6b571dc9c59a329285d6a6c5943313bedfc3144a3f0848eecbe0784a27bdaf395715c57909bd5e90447c
 AUX splashutils-1.5.4.4-freetype-bz2.patch 515 SHA256 06a9f6d9d9206d09115abf3d8c86692908530f11168a51d99dd43a465e7092c0 SHA512 880cc0703de76c3c145680f1e85e461473df3dd41817757878bd18dc4c0d10484d1f93f995e6818ddcf3309e6b9febc1447ce7880006df8e08626bac5aae2e5c WHIRLPOOL 50c58afaacfd2594c1bc402c07680d742809e2af694b98acb3656f7dbc50cc85a537bec4b362c443f9dbe1054307c397cdba9613392ef6c508760d2487095265
 AUX splashutils-1.5.4.4-gentoo-typo-fix.patch 567 SHA256 92ee0727bfd9fe6f9565d09546ea63079467f67c2d57385713a62d0b617bb1bf SHA512 f5d5fd222b5dea9906e5a7541ad2ab1ff161061c6bb5e013929767d3f6aa9fe245092e201b8d42a086938be3320b77384301c22bc307cf7872daac33184127f2 WHIRLPOOL f971453383c1abf28c912a49c426c7da92ba6d44580981e89bedd4ef7df9940236e53842bd31ecb85c44c2ff31230569a33e7233498269aefc8caeacb84b9caa
+AUX splashutils-1.5.4.4-llcms2.patch 1720 SHA256 951c3806f44d36be34e3d69266fa1d876ee6096d3e035db0f327cb8d37e2726e SHA512 419bea9361665f9882deee023f9e7300e9cd2580d02b1eaadc99615b5c26f3cd6c36939b52cafbed79a1d916794fc96b062f6b41137e3dbdc3aad74d8deef926 WHIRLPOOL c78c66663d0e903852da7f1956253dd568ff0108b32894792ad298caff652d1169ed5687bcf029f782834f3dc14161a4cb136122527d2b55a1b37e0c037c7798
 AUX splashutils-1.5.4.4-multi-keyboard.patch 10158 SHA256 95a0de0a666c29c7d80fe653659191770d359f62d1edac00dc3ad97ac14d6dac SHA512 71056d599f4465ef424444d717ce1597295e0228f548c69cb36ef617075af430b1ac50f5be27bca65a50ed9e7d0169ceb256dbc66cf4b635fd9f8310d32baeae WHIRLPOOL ce782d0a6a21350fd9b00792f0eb247907b3bcf900c0e5aa8f6304d4d3c05ee59f1b036d623f25262484bd8d48ddd95a5ef086644d369c6190570be8db432112
 AUX splashutils-1.5.4.4-r3-bzip2.patch 1808 SHA256 9622dc7721e0c36538e8a1321ff59e224231578675831909d1c68f3eb9f46434 SHA512 8c1ea0bef43c4c829615db010a958ffa7c4ab8c84786a39e702be677745e47004ee59bdb1d7c80bfc637ff7c0f9a129f225e024251492b45aec7c42e1bd73da0 WHIRLPOOL 2522dcc049d68269764c9254f8884d62aa16d08fe5fa917b7c89db46617c1694c73c79f3af30c361cdd22b4d68c07b0b52c70c3243c15b263c6b5cdb6e2ef457
 AUX splashutils-openrc-0.4-fix.patch 2750 SHA256 9da0e841d23b07b262b4f49e25986dce24f73f554f25bc4219024414ccdd9846 SHA512 df844cdb4c1d418390031a669a0907db9e2833e5a87cebfc822e0e43e9ea43f4aaa8ab594f1c7527e056688fc96b38cefbacb2310ba9c6ee3cb06782137f6a76 WHIRLPOOL 59c9336da412c4aadea1fdb69cdd5fa4332284ce482923d392535e1833aa6e8f21981cb33c5bed3dd65b08e65e835fd7f71ba2dcf14e35575c97208d429235df
@@ -27,16 +25,6 @@ DIST miscsplashutils-0.1.8.tar.bz2 91997 SHA256 38e8434c7266126477237c4d9e6cbeca
 DIST splashutils-gentoo-1.0.17.tar.bz2 15814 SHA256 6877263d0b6f5a3532db0d6a531cd4d41fbc6c45a16c5d10050e9048ecc1af81 SHA512 75f1fbfdf165f571b0bf09235235827f370e1b940f1717c4faf5b223caba0b80f853a910ba492c776512aecfafa6e74fd964239bbc6cf412620143d5ffc74167 WHIRLPOOL de9e1ca86a87c169f0a2f7844ab9a68b29cc46c208daca4d13cf7d552b35c05b6e266d66724078cf1f6eea3d41496fdf4fd7b3219697b2032520ad2b9a5ec5c9
 DIST splashutils-lite-1.5.4.4.tar.bz2 441340 SHA256 bc0e22293d4550281d2289672da3acb42594c18a75b9d00ba75526e05162ec6b SHA512 1a78216a1de1fdccff514494d7301640e447c65466e1fe02428e5114485507f67fe4394094880d927d074a8ab2d9c786ba03f9fb0371eb7ab6ef4e3b01aa4613 WHIRLPOOL f861a1673fd9e1fe32e417da48be8c472c5c3cc06844eb0886a66b498ca38cb04a6e51708821eefe3e15f66004bb6a4ef76df7242643b34090035bffdf1f87d7
 DIST zlib-1.2.3.tar.bz2 425209 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2 WHIRLPOOL e874b123296f5d77daf60617501b30f4beebccb64b3910c2539f75f6c194a2cf4885dc7a3904bf790e1651120ec33b55c48e95970dd6bfd6c4d0a2ea48d7d0f4
-EBUILD splashutils-1.5.4.4-r1.ebuild 7627 SHA256 0eba936ed765b4f044fa451d523936a5829deffdded449ca70cecbf87cbe1928 SHA512 8a80c2db244a7733c262804df1e382aebdc7c1ca98692a7858eb222cb55633cacc877c1f79143a1268e5ecab333fd55d32de7b1e555045d345f729a091348431 WHIRLPOOL baa5a8208b6bc52ba6333b22752396768938f0cccbb25ebb471e9f92bb0f97b7c9221d2083a4d682e01f844c5219c51bde71e59a692ad35f3b5151a17d722ba4
-EBUILD splashutils-1.5.4.4-r2.ebuild 7386 SHA256 f9242c3660af280ca9993e91a1b0ee1a5d90adb053972d39ac1b416564491d69 SHA512 58f4a87cafdca7bdee74dac033f50e965c77e1113bf9de861dbca781df89db9d30f5325f7835e57bc07dbc8fd623a4bdb00a163dfd5c3c28bc2190d4f232d7b7 WHIRLPOOL efcfea0db0939692697dc67693a360cf7318bdff4465caa1fb54e418bafb3761325750a96bf27ac0a08eb074865da7eb27bc22b64ee2273f088c42e82729f6a4
-EBUILD splashutils-1.5.4.4-r3.ebuild 6988 SHA256 50191a23ae7850fba648abb4b8a563bda1f603290e54253d50daa567ac99fb45 SHA512 6407ef186bae11c2e764aadeef0feff6ec945bfd83f510a27f9b61c724e850f25f8466e16dc31cde66051b6adf367ca5202b6df007a53a4ea20bb7dff21bf587 WHIRLPOOL fe19503a2fc1e4bbcedaa15d2796502bcac9fb93b26807dd43a3ae0f4279fb997c13f01f7ed01b1498aefe1ae31d1835ed17f08a4d0a87c0c88a152fd911d108
-EBUILD splashutils-1.5.4.4-r4.ebuild 6780 SHA256 de78ee53cae39ddb23839317ffe7afc6c102b40467c19a766419312329a19b87 SHA512 caa32541a7000e41e536a5af723db776e46ebb35796c246521797c7c2ce35762969fc9126c8e88a3f46e8f485f7cab1350fd2b6951181824fd1dff551bba8aff WHIRLPOOL 750d21485c4f682fa3f39a7825cbcbcacec5ea873b5732baba639c33bba3be91ccc2cc3bfaa7844a7bd5b4feaac01c2cd3a29d4443135d7565616d06c05f873a
-MISC ChangeLog 39244 SHA256 a40fb858a921843e1f0626ef6650bbec3c842fefa1d5e738dcedcd70080f82e3 SHA512 e4b6ab7a2d055583ebce90a343e327c3c60d83c139e41625a52ad1e354cebe5f6b94b6ec601c74b340b50ae212c9dbae18aae0b3fc2b5642d6827ea55b62ab41 WHIRLPOOL 97e8cfd92f1cd501c1ba9a1756ba9a3b67be9e4873960e96c37ff3587b5d9a938cfb9e2f7b6afc949f3afb63ca8cd99b2276c2e037c417dbf0111bdc59a06ba0
+EBUILD splashutils-1.5.4.4-r5.ebuild 6820 SHA256 50892577346ddf9b3c7d91b983deafb134e74f39dfb22223b7d2da8bb0bcd7be SHA512 fec1b220e17b1eeb6b93eeaa1edfc2f5a759848eafc955fe2d5faaac9a52573e7b4a6aafacc284738cb370d47c5538710525b74f26094f7bf72ec1fa2fb3c304 WHIRLPOOL 137bbb45773a3a37db6c2b207de43198f9f7ab76f1152c5931412f26f46cd5f954a04f656e24f927f4560798fcd9ea6ac7e0a18d3650c16cb57b46910d6993c5
+MISC ChangeLog 39478 SHA256 555ddb8d92370903f9a3a1f8e4c7f16dc1a6ebc74287d33267d96ae890de6fd1 SHA512 3790470608b97a1c849167db9528634b27c84bc713418e9e60cdf1c040ba117ba20b46fee6e50a957f41a0b7ca571cc93929dbe6364512308b24499833e50747 WHIRLPOOL b5dbc17873ae799eeae254d7e3d77cb2717b259b96fae236b34eccb4d15686ab125265b8ef8ab6f4d7c0f28615cf77d98a196a4a93bb13dda3c265724857a676
 MISC metadata.xml 324 SHA256 51a25c570502116aa46bfe2bdfbb99be8a81290879563848978a9ee301a3dfa5 SHA512 4fccbcc1c6372560a0139262caf1f305cf658be6761e9703a0033da08af0d8a3dc310e1ceec52761b173fce2d6a94971fbde69ee0a419a7f00457f08691b233e WHIRLPOOL 60b68573116b7ef2a1a4fd87ab47172b56617c7d713ba44e9cdfce23283bf45ddf94ce0d4dd7d9d8ca7ab0c3af164557ec8f16ae872269b1b04b92d3a6e4781d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlPn4SMACgkQcaHudmEf86q/QwCeMCezeI3PYiOR1xQ8aW2iM2Bx
-2ngAn0dbF2Uzj4UHi+aiNDYM4+1IY93v
-=stZt
------END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-llcms2.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-llcms2.patch
new file mode 100644
index 0000000..894bf3c
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-1.5.4.4-llcms2.patch
@@ -0,0 +1,43 @@
+# Copied from https://499654.bugs.gentoo.org/attachment.cgi?id=369628
+# See https://bugs.gentoo.org/show_bug.cgi?id=499654
+
+
+--- configure-old	2014-02-03 18:49:57.524228900 +0100
++++ configure	2014-02-03 18:54:31.920895855 +0100
+@@ -13025,13 +13025,13 @@
+   MNG_LIBS="${MNG_LIBS} -lz"
+ fi
+ 
+-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cmsCloseProfile in -llcms" >&5
+-$as_echo_n "checking for cmsCloseProfile in -llcms... " >&6; }
++            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cmsCloseProfile in -llcms2" >&5
++$as_echo_n "checking for cmsCloseProfile in -llcms2... " >&6; }
+ if ${ac_cv_lib_lcms_cmsCloseProfile+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-llcms  $LIBS"
++LIBS="-llcms2  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -13062,7 +13062,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lcms_cmsCloseProfile" >&5
+ $as_echo "$ac_cv_lib_lcms_cmsCloseProfile" >&6; }
+ if test "x$ac_cv_lib_lcms_cmsCloseProfile" = xyes; then :
+-  MNG_LIBS="${MNG_LIBS} -llcms"
++  MNG_LIBS="${MNG_LIBS} -llcms2"
+ fi
+ 
+ 
+--- configure.ac-old	2014-02-03 18:49:17.970895525 +0100
++++ configure.ac	2014-02-03 18:53:08.964229101 +0100
+@@ -538,7 +538,7 @@
+             MNG_LIBS="${MNG_LIBS} -lmng"
+             MNG_LIBS="${MNG_LIBS} ${JPEG_LIBS}"
+             AC_CHECK_LIB([z],    [zlibVersion],    [MNG_LIBS="${MNG_LIBS} -lz"   ])
+-            AC_CHECK_LIB([lcms], [cmsCloseProfile],[MNG_LIBS="${MNG_LIBS} -llcms"])
++            AC_CHECK_LIB([lcms2], [cmsCloseProfile],[MNG_LIBS="${MNG_LIBS} -llcms2"])
+           ],
+           [AC_MSG_ERROR(['libmng' library file was not found.])]
+         )
diff --git a/media-gfx/splashutils/splashutils-1.5.4.4-r4.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4-r5.ebuild
index 298cc8b..40dafc1 100644
--- a/media-gfx/splashutils/splashutils-1.5.4.4-r4.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.4.4-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4-r4.ebuild,v 1.1 2013/10/14 13:50:25 pinkbyte Exp $
 
@@ -95,6 +95,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${P}-bzip2.patch"
 	epatch "${FILESDIR}/${P}-multi-keyboard.patch"
+	epatch "${FILESDIR}/${P}-llcms2.patch"
 
 	if ! tc-is-cross-compiler && \
 	   has_version "sys-devel/gcc:$(gcc-version)[vanilla]" ; then