Drop lcms-1

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

11 files changed, 27 insertions, 633 deletions

diff --git a/media-libs/lcms/ChangeLog b/media-libs/lcms/ChangeLog
index 0b4160887d57..069ca21d9bb7 100644
--- a/media-libs/lcms/ChangeLog
+++ b/media-libs/lcms/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/lcms
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.192 2015/04/08 17:59:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.193 2015/05/28 18:07:08 dilfridge Exp $
+
+  28 May 2015; Andreas K. Hüttel <dilfridge@gentoo.org>
+  -files/lcms-1.19-cve-2013-4276.patch,
+  -files/lcms-1.19-disable_static_modules.patch,
+  -files/lcms-1.19-fix-python3.2.patch,
+  -files/lcms-1.19-fix-swig-destructor.patch, -files/lcms-1.19-implicit.patch,
+  -lcms-1.19-r1.ebuild, -lcms-1.19-r2.ebuild, -lcms-1.19-r3.ebuild,
+  -lcms-1.19.ebuild:
+  Drop lcms-1
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> lcms-1.19-r1.ebuild,
   lcms-1.19-r2.ebuild, lcms-1.19-r3.ebuild:
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index f70883dd9b44..974ae11916ce 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,37 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX lcms-1.19-cve-2013-4276.patch 2113 SHA256 fb1cae9ada801f9f0ec3d3107a0e462f1c9b38c590b5ac9c7206635925b1d3d1 SHA512 785eff7bf8f8d2bf085877d7d61e111e0b149f5982958e12c77e2f1134d0239b8f280289fb65004cce3d82e1a6e80047bea9c28a471aac58e3b7a8ec1aa62085 WHIRLPOOL 36ce2616f82e3f05336ea3284a01b813e03cce262dc6fda226fdcbfcae47eee52a26330e2b22c1ef81a10d9cb8b08d1ef9818133e3690a689afd781e6fa2a7ed
-AUX lcms-1.19-disable_static_modules.patch 578 SHA256 bd56a283da65a7ab262d35c890a99e8b103a3a73e50b997e404c3c0ac3ae467e SHA512 fba391dd6d69122217cdcde985d2154dfc2fd9b9aed5a50a013248e024ee54fe07a98acf917fd0e889578616512a2bdf155f0cbe782795e406d96a90b10bbb33 WHIRLPOOL d40c77d18ab5249252e4cadd5b6e2e40c1e43c0f761758908f2afa06d29dce41d56de52d33fe043d7441180c40ca572571fb7c27b87c43406991e5f1e25ff22c
-AUX lcms-1.19-fix-python3.2.patch 1098 SHA256 aee8200bdb7106b5aaa0df92590de5c857319373e95c7617fb7541717ce3219a SHA512 6b8bda2f792ca5afe65e62c618613583763904f7a6994c6f60d38285b4b823ebf92fd449afedb2b57d61ddf7edc82f277dbe4bb7b8dc8e751ccbe1d0970c8277 WHIRLPOOL 842dcb6bd64505bc0f05ebf8a621514a643ae8bdd8ead4d4fa5e827e0dbc4f7b39a65863cbfb0d4bfe047f06da1b00ef7837b107de574b3b5e8f6150983e0c3f
-AUX lcms-1.19-fix-swig-destructor.patch 345 SHA256 ac8ade0b3e45fd934b88925256fe6e729bb4b6b38f3ad896dfef3dc11e8b52a7 SHA512 00d1b2dd2ed32d4848c726e6616a4cb9caccc9ad410c796d400bd8566938854100c0c94e8db6446ab00a3dfef610406b6eca1f7a288a37b7249f3f98e9653a91 WHIRLPOOL 4247ffa55abdec48e98926ee174101bf440d00e81cf7c3fe2940693de04697d692b2538ca5b5d3917a5f1ea8ba72f2d964bcc7b7b49bc484bd18e6e260332484
-AUX lcms-1.19-implicit.patch 1308 SHA256 327eb96faafac582362f57800727896bd5c2206a7bb150f12ef7787e84f3ddd9 SHA512 120db0ea4c5a77563dffef55507a8e7fa172ee73ad3943b6ba55c4a01f4a0a2ae21794f4775d58f0d8ba6b5fbdc28c461622416981683063ff746db9a38c724b WHIRLPOOL df45ecfc6fe36db90c676e25f053b370af466648e36e752acfd9f5c0d5acc25a445bf0a8a476f0913ca5c7f0304940c3af35bf56c021fa34045cfdb1e52419bc
 AUX lcms-2.6-cve-2014-0459.patch 3105 SHA256 9f74e258edd57859d95724e839ac66e83416439c2360834b0c1f3b8c99b6f532 SHA512 aada1d63c6e1c98fa4577433662d3005aee89f8e808041de2bf7de7671f5ca856359cab7d6b0312e379557da49be73a4553e9f40b3b9f7b7ceb296bc1b88aaff WHIRLPOOL 1176de556781820139e0365c8651c801c0b8e9f10af9221034271fe96dcbce5cb052a5296aa2af9b991f2b475afb3e4a2a3bc88111eef01e2dbf5cf1975c3fb4
-DIST lcms-1.19.tar.gz 927752 SHA256 80ae32cb9f568af4dc7ee4d3c05a4c31fc513fc3e31730fed0ce7378237273a9 SHA512 85a55ad0673f0df2aaa80d18caa50314319f8da5ee4d84eed919059d0dad9861d684ef6353ce0ec6f9892a4603ce8e8e12f84d46858e23f52846b8aefd3cf449 WHIRLPOOL cb6bcb5497798ff2fa86ff433eae6afea38408306345156da6103aa8af6fc0d48fa1d730c5958c027ba06ea023236328bcb00be60f600d987d060625385c820b
 DIST lcms2-2.6.tar.gz 4583389 SHA256 5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1 SHA512 af2dd8829a5d8b280688bc247812829c885368951d385a23a1596cf8d0a7aed627c8faa35740073efc51a86ef5c900fc9bdb9dcdfad885fb8b1eae16953f9041 WHIRLPOOL 4fe1be53c48b0928bd474e05613c443eea49570a074d22b71863c485408523116927655b57d86bcb02aca85d9e06c0e26d9ee46bc7c4d746e91e951212de9e59
-EBUILD lcms-1.19-r1.ebuild 2601 SHA256 a1ed7a315b5d8ff4ddd091661d6e78efc242940620d998a291c2ceaba74bb871 SHA512 dd32e3440e9b7a8bac8b7e69add67d114beae2990ef5bb2beb7dc9620942eec6fb9af713a667a5352e3952e8dea2851984fde731e8deebfb675b8beb8c2b0a17 WHIRLPOOL 98b35d0cac1e461aeaeff1c0d3055f66edec9c016b8f7c848b25a27dd2fe8d98b69fe8aa55b067f05eaf77e0a239e3d1bdcced581a21d42c809c042361caf00b
-EBUILD lcms-1.19-r2.ebuild 2933 SHA256 460b5d4b3a86162baeaa1bd279f8c6e0cb3d390f00bc0cf6877943c99466a779 SHA512 c0ca92186bdc13d83a8a37f772bcee4acc979a8b0fc7cea67c75e50d3cc7853a8d4e5b5fd43d742325564c7ebe4596c5293321813d076e728e5b99c579ac8697 WHIRLPOOL 1f347f02f77000f4eb36231c8687ea6468487de955efb6b94e6e1fd907a2520420c8ba37ca3bf7f6b22a72a1c91a63f8f59000f20eb549ec0c09365c77d75af2
-EBUILD lcms-1.19-r3.ebuild 2973 SHA256 b1f0ba3121783fdba4a7a34c6681545c7724a05a589d8ebd25ee7b4fb94b7b32 SHA512 86490640ae24f865316c20d3d041f9904cb8b720546c6a1695cbea54f49b81d8c5abd5a091ac0618fbe34b0e838bf71a250d5a680daddd220e7fc8e3bb2aa5b5 WHIRLPOOL ae8053e98cf3bcbd1e08536cb428ee2a9a08b6012ccf1ddc9c2ace76382a0f9669dde75f33479ac042573f3f511ba772cb14c09e39426f5fb7d967fef76464fe
-EBUILD lcms-1.19.ebuild 2710 SHA256 0e21a730735f70db5d58b7eb16f453bc50f5953c5cbc2eb86eb73eb8d528f479 SHA512 1ef0381d435d04e93fc330eb892f743c48a986f368914a6c452c0575417f1119344e65f906d84f565ecfe8ac9d0283fae2e9bccc6d5f2545a51cd8138846562f WHIRLPOOL 8fcbc34c9e4814b0720cf487442b3ee32632900c8b8f4024f40d87f65b9d38ac4e9c515e1ba82446166899cb106d0c0b6bf64e9d974e5614f65757c0ee0642e2
 EBUILD lcms-2.6-r1.ebuild 1460 SHA256 e94bd9b55d1c72d69def3225e845eac619b3657ded07166b11798a3a7bcd1d7f SHA512 5a0dbd37835404e4a662858f866be9222795a2f8127bdf0165c1a782d962914a9503a8b398eea3e039ec59576bb2fb0b99e0cd4f6d93e4fbfeb1e3f51ab66cb5 WHIRLPOOL 8c22b743a3ff646188318927f633b14abf52c3a6f9591292c69e4e8d200adad7c931a05613710cd81e1356968de502750b2f91b721dd950c9bf3976539264e70
-MISC ChangeLog 23997 SHA256 9def7e3cc2c60a45c724ee290f2f37fca148eb8471992d657d8a6467b5f7ad85 SHA512 dd2df7c83c8afb469013e40fd088513fe2af999565bce4daa6849590e2e5ce15398f20cf876f367b121420443aa74c4923c2f4d436b3de0fdb92502430c4a93d WHIRLPOOL 9d3ed86f8f246fd75f43dcf9605d324a578b6449d981f3bfa49b0e4ac8fb6f9e0a3f011dd8900005fb954d681868f26553d5acb10a21d6110304d45a176804d3
+MISC ChangeLog 24369 SHA256 8a015a0d25554ab447d10159af7d1e7f777729e6ae4a70f083369e730f18c58a SHA512 bea2a9b879c5f634738d19ae3d77fc55aa0371b68388e1e3419983daa372db343418b7afe42d21eb90804b1a22ab8120fd061d728d9174e0149309445ee4b51d WHIRLPOOL 1d9ff29d8f28b5bb68e9367ced650fc0366eb26345b9df211dd62f35e297e998aa0e502a6fff81ff5714ee4934a0a230288d552fb4137ffd2a01e4cb2a96338b
 MISC metadata.xml 161 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 SHA512 3b5d653ba492267297653f61d148b859d366b53d9c29670f175c84622f6ad64141e93e30db08e24f87a75e6fcf1ab187cc8783b72aa2ee1709cf1ef6c7c75e22 WHIRLPOOL 2516e48e62e1604c152e32a6336881cb02f3599c23856a220019bc807611880480bfe4af7a60a2bb45efbb93faf89141ccfd9fde69044677604bf976dfb65988
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJWyfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO+BsP/1iZ4/70vN+OT+/na50Lr7lI
-WK5pnBnAuy54J8bym05/TIksMTd4YNBMXH359genp3I/0mqBDUEjxhRm40szy566
-pDi75NIq1p7j70ZpEsdlg0zO2OWp11LQskBryRNs8iH+BHQMfx8/x27UNjeQEtdB
-wD3J7TtQtj5CLSHujhzasTIL2MXHO1MUYhbjTQOukdkr0lWKWiJZqxg2Dy6SpTk4
-0lZxje1zHiBXEdAOfJ4CVTNJO+XAkZ55G7l6Qp1F+i+zeL9DRwrBIvQmYgIN3J5E
-b3PyJUhb9SXbp9iwzDAKg/S1/C7BV25uQd1+c19VLLORfKCiA0y3DaCm1r1Jy50G
-1Pzz2/l+oKnFZ3KlH+F4q3zXX/Z0Alq5omkuiKD2SzVR/KonuSUHRuiIaqfxuQaS
-sbaKObkDL3qVKekLzX7JZXl7JIFK3ewwL5kTmRc9ER/HXamU54Iz8+RtlI9X5z6V
-xTYGOaloljbuh71FMaRqbU0y2KyS44FaPP8PX2Gk7J4q8OXV4xV0ni9aQenRpGCu
-8Xz2H0W8RwbUYclFiTmqL4lEVsZ08eZNvS052hP3VHs9k06i6QbqmJv5b08L5Dec
-JxcR5Z0/b9X+oOlVfL9ktZQIqHb/QgJS8/iADyV2834xkqE/wDC1wY9HhvOk/uXg
-cKb5n0A1Q5bXg7+uOIYk
-=D/4J
+iQJ8BAEBCABmBQJVZ1f5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCMkRCMDNGRDg4MkUwQTczOTgwMkE3RUEx
+RjU1NzRDRUExQkE5Mjk1AAoJEB9VdM6hupKV9SUP/juBTBFFWqXgSVs7xdy328du
+NAzFaqd5Bya8ZrdogrLJFTPf37bU0CnkQfSMzJDj4lEPo+JY3mF/dPaVH9mmE8uz
+TsZnIGHM3ZxHIb5V8orCQ9pYQNlTfC55ZG7xoswqOG9kKL7cNY0xYErbCUpNptdI
+rNYpjUq+OeUsl+16joP9MJpqEZJiE1uQjhp03rgLa3q8CGdBkHJPHQK7sSZn5pnD
+Hc4Fja58bIOtr7ZAcClA3sUK1FtP9NQWvqctwLy0tndyGAegdpCUroiplPEkHHis
+7VE9EVttlc+woJEa3tKmmWnzynT4GfuRaROnrxXFfktdnqRn4uNEU1EWsXD/j4h7
+DiqP/x2TxPNgfV7Sb82fs8mbsF//ReIzOs1neSOdYjqC/v7R1EXLAUiEdi/VNLQT
+4pnidY86umwbO8PIVt4cdDxnKmdP2XfGbGWpKTyQw2tvPyC10MOzmZ981NNsMDEJ
+00U4yf1f/pk8v6KX19ToUAEaGcTNKyXdu0UtGFFx19jyLWOAw/b1XVbcjmWwe+ZW
+zWDHPIY/vuuWwCfUZ95mBVJG4JCBRgR05TroEzsqQPysk9jNUPZ+Bg8ViHxeqSaY
+E7lJU0jdl9+2EzGyw7GuxCIdMeT1ieepTNl2vb+NIEacUjPiiq4bhKLq9OMWuBL+
+9pA+066oQ/cy6HFOMgyf
+=aJXX
 -----END PGP SIGNATURE-----
diff --git a/media-libs/lcms/files/lcms-1.19-cve-2013-4276.patch b/media-libs/lcms/files/lcms-1.19-cve-2013-4276.patch
deleted file mode 100644
index 87c96605d6b0..000000000000
--- a/media-libs/lcms/files/lcms-1.19-cve-2013-4276.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-patch taken from:
-  https://bugzilla.redhat.com/show_bug.cgi?id=991757
-
-patch checked against:
-  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718682#10
-  https://build.opensuse.org/package/view_file/openSUSE:Evergreen:11.2:Test/lcms/CVE-2013-4276.patch
-
-diff -ur lcms-1.19.dfsg/samples/icctrans.c lcms-1.19.dfsg-patched/samples/icctrans.c
---- lcms-1.19.dfsg/samples/icctrans.c	2009-10-30 15:57:45.000000000 +0000
-+++ lcms-1.19.dfsg-patched/samples/icctrans.c	2013-08-06 11:53:14.385266647 +0100
-@@ -86,6 +86,8 @@
- static LPcmsNAMEDCOLORLIST InputColorant = NULL;
- static LPcmsNAMEDCOLORLIST OutputColorant = NULL;
- 
-+unsigned int Buffer_size = 4096;
-+
- 
- // isatty replacement
- 
-@@ -500,7 +502,7 @@
- 
-     Prefix[0] = 0;
-     if (!lTerse)
--        sprintf(Prefix, "%s=", C);
-+        snprintf(Prefix, 20, "%s=", C);
- 
-     if (InHexa)
-     {
-@@ -648,7 +650,9 @@
- static
- void GetLine(char* Buffer)
- {    
--    scanf("%s", Buffer);
-+    char User_buffer[Buffer_size];
-+    fgets(User_buffer, (Buffer_size - 1), stdin);
-+    sscanf(User_buffer,"%s", Buffer);
-     
-     if (toupper(Buffer[0]) == 'Q') { // Quit?
- 
-@@ -668,7 +672,7 @@
- static
- double GetAnswer(const char* Prompt, double Range)
- {
--    char Buffer[4096];
-+    char Buffer[Buffer_size];
-     double val = 0.0;
- 	       
-     if (Range == 0.0) {              // Range 0 means double value
-@@ -738,7 +742,7 @@
- static
- WORD GetIndex(void)
- {
--    char Buffer[4096], Name[40], Prefix[40], Suffix[40];
-+    char Buffer[Buffer_size], Name[40], Prefix[40], Suffix[40];
-     int index, max;
- 
-     max = cmsNamedColorCount(hTrans)-1;
-diff -ur lcms-1.19.dfsg/tifficc/tiffdiff.c lcms-1.19.dfsg-patched/tifficc/tiffdiff.c
---- lcms-1.19.dfsg/tifficc/tiffdiff.c	2009-10-30 15:57:46.000000000 +0000
-+++ lcms-1.19.dfsg-patched/tifficc/tiffdiff.c	2013-08-06 11:49:06.698951157 +0100
-@@ -633,7 +633,7 @@
-     cmsIT8SetSheetType(hIT8, "TIFFDIFF");
-     
-    
--    sprintf(Buffer, "Differences between %s and %s", TiffName1, TiffName2);
-+    snprintf(Buffer, 256, "Differences between %s and %s", TiffName1, TiffName2);
-   
-     cmsIT8SetComment(hIT8, Buffer);
- 
diff --git a/media-libs/lcms/files/lcms-1.19-disable_static_modules.patch b/media-libs/lcms/files/lcms-1.19-disable_static_modules.patch
deleted file mode 100644
index 23eeb48cc96d..000000000000
--- a/media-libs/lcms/files/lcms-1.19-disable_static_modules.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- python/Makefile.am
-+++ python/Makefile.am
-@@ -22,7 +22,7 @@
- 
- endif
- 
--_lcms_la_LDFLAGS = -no-undefined -module -avoid-version \
-+_lcms_la_LDFLAGS = -no-undefined -module -avoid-version -shared \
-                     -L$(LCMS_PYLIB)/config 
- 
- _lcms_la_LIBADD = $(top_builddir)/src/liblcms.la -lpython$(PYTHON_VERSION)
-@@ -31,7 +31,7 @@
- 
- _lcms_la_CPPFLAGS = -I$(PYTHON_PREFIX)/include/python$(PYTHON_VERSION) \
- 		    -I$(LCMS_PYINCLUDE) \
--                    $(AM_CPPFLAGS)
-+                    $(AM_CPPFLAGS) -shared
- 
- 
- EXTRA_DIST = lcms.py lcms.i testbed swig_lcms
diff --git a/media-libs/lcms/files/lcms-1.19-fix-python3.2.patch b/media-libs/lcms/files/lcms-1.19-fix-python3.2.patch
deleted file mode 100644
index 4388634141e6..000000000000
--- a/media-libs/lcms/files/lcms-1.19-fix-python3.2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.ac.orig	2013-04-18 00:04:25.940676322 +0400
-+++ configure.ac	2013-04-18 00:06:34.233675498 +0400
-@@ -93,10 +93,10 @@
-   AM_PATH_PYTHON(2.2,PYTHON_OK='yes',PYTHON_OK='no')  

-   if test -n "$PYTHON"

-   then

--	LCMS_PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`

--	LCMS_PYEXECDIR=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1)"`

--    LCMS_PYINCLUDE=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()"`	

--	LCMS_PYLIB=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,1)"`

-+	LCMS_PYTHON_PREFIX=`$PYTHON -c "import sys; print(sys.prefix)"`

-+	LCMS_PYEXECDIR=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib(1))"`

-+    LCMS_PYINCLUDE=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_inc())"`	

-+	LCMS_PYLIB=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib(0,1))"`

- 	AC_CHECK_FILE([$LCMS_PYINCLUDE/Python.h],PYTHON_OK='yes',PYTHON_OK='no')

-     AC_SUBST(LCMS_PYEXECDIR)

-     AC_SUBST(LCMS_PYINCLUDE)

diff --git a/media-libs/lcms/files/lcms-1.19-fix-swig-destructor.patch b/media-libs/lcms/files/lcms-1.19-fix-swig-destructor.patch
deleted file mode 100644
index af8e690d81ec..000000000000
--- a/media-libs/lcms/files/lcms-1.19-fix-swig-destructor.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- python/lcms.i.orig	2013-04-18 00:11:48.179673481 +0400
-+++ python/lcms.i	2013-04-18 00:11:56.769673425 +0400
-@@ -191,7 +191,7 @@
- 				ZeroMemory(v, sizeof(COLORW));

-                 return v;

-         }

--        ~COLORB() {

-+        ~COLORW() {

-                 _cmsFree(self);

-         }

- 		const char* __repr__() {                

diff --git a/media-libs/lcms/files/lcms-1.19-implicit.patch b/media-libs/lcms/files/lcms-1.19-implicit.patch
deleted file mode 100644
index 076ed15be794..000000000000
--- a/media-libs/lcms/files/lcms-1.19-implicit.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-cmsio1.c: In function 'AdjustEndianessArray16':
-cmsio1.c:118: warning: implicit declaration of function 'swab'
-testcms.c: In function 'CheckSwab':
-testcms.c:113: warning: implicit declaration of function 'swab'
-================================================================================
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -6,6 +6,9 @@
- # Don't require all the GNU mandated files
- AUTOMAKE_OPTIONS = 1.7 foreign
- 
-+# _XOPEN_SOURCE is required for swab() but undefines strcasecmp(), so add _GNU_SOURCE as well:
-+AM_CPPFLAGS = -D_XOPEN_SOURCE -D_GNU_SOURCE
-+
- includedir = ${prefix}/include
- 
- # Shared libraries built in this directory
---- src/cmsio1.c
-+++ src/cmsio1.c
-@@ -24,6 +24,7 @@
- 
- 
- #include "lcms.h"
-+#include <unistd.h>
- 
- // ----------------------------------------------------------------- Tag Serialization
- 
---- testbed/Makefile.am
-+++ testbed/Makefile.am
-@@ -6,6 +6,9 @@
- # Don't require all the GNU mandated files
- AUTOMAKE_OPTIONS = 1.7 foreign
- 
-+# Required for swab()
-+AM_CPPFLAGS = -D_XOPEN_SOURCE
-+
- INCLUDES	=  -I$(top_builddir)/include -I$(top_srcdir)/include
- 
- check_PROGRAMS = testcms
---- testbed/testcms.c
-+++ testbed/testcms.c
-@@ -36,6 +36,7 @@
- #include <time.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <unistd.h>
- 
- #ifndef NON_WINDOWS
- #include <icm.h>
diff --git a/media-libs/lcms/lcms-1.19-r1.ebuild b/media-libs/lcms/lcms-1.19-r1.ebuild
deleted file mode 100644
index 2e121bd8cf02..000000000000
--- a/media-libs/lcms/lcms-1.19-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.19-r1.ebuild,v 1.10 2015/04/08 17:59:35 mgorny Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-# autoreconf needs to update python macros for py3 support.
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
-
-inherit autotools-utils python-r1
-
-DESCRIPTION="A lightweight, speed optimized color management engine"
-HOMEPAGE="http://www.littlecms.com/"
-SRC_URI="http://www.littlecms.com/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="jpeg python static-libs tiff zlib"
-
-RDEPEND="
-	tiff? ( media-libs/tiff:0 )
-	jpeg? ( virtual/jpeg:0 )
-	zlib? ( sys-libs/zlib )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-1.3.31 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-disable_static_modules.patch"
-	"${FILESDIR}/${P}-implicit.patch"
-	"${FILESDIR}/${P}-fix-swig-destructor.patch"
-	"${FILESDIR}/${P}-fix-python3.2.patch"
-)
-
-DOCS=( AUTHORS README.1ST INSTALL NEWS doc/{LCMSAPI,TUTORIAL}.TXT )
-
-src_prepare() {
-	# Breaks out-of-source build, only corresponding .in file is needed
-	rm include/icc34.h || die 'rm failed'
-
-	autotools-utils_src_prepare
-
-	# run swig to regenerate lcms_wrap.cxx and lcms.py (bug #148728)
-	if use python; then
-		cd python || die
-		bash swig_lcms || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_with jpeg)
-		$(use_with tiff)
-		$(use_with zlib)
-	)
-	autotools-utils_src_configure --without-python
-
-	if use python; then
-		python_parallel_foreach_impl \
-			autotools-utils_src_configure --with-python
-	fi
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	if use python; then
-		# Note: it intentionally passes evaluated 'parent' dir.
-		python_parallel_foreach_impl \
-			autotools-utils_src_compile -C python \
-			top_builddir="${BUILD_DIR}"
-	fi
-}
-
-src_test() {
-	cp "${S}"/testbed/*icm "${BUILD_DIR}"/testbed/ || die
-
-	autotools-utils_src_test
-}
-
-src_install() {
-	autotools-utils_src_install \
-		BINDIR="${ED}"/usr/bin
-
-	if use python; then
-		# Note: it intentionally passes evaluated 'parent' dir.
-		python_foreach_impl \
-			autotools-utils_src_install -C python \
-			top_builddir="${BUILD_DIR}"
-
-		python_parallel_foreach_impl python_optimize
-	fi
-
-	insinto /usr/share/lcms/profiles
-	doins testbed/*.icm
-}
diff --git a/media-libs/lcms/lcms-1.19-r2.ebuild b/media-libs/lcms/lcms-1.19-r2.ebuild
deleted file mode 100644
index 87978f63b571..000000000000
--- a/media-libs/lcms/lcms-1.19-r2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.19-r2.ebuild,v 1.5 2015/04/08 17:59:35 mgorny Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-# autoreconf needs to update python macros for py3 support.
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-multilib python-r1
-
-DESCRIPTION="A lightweight, speed optimized color management engine"
-HOMEPAGE="http://www.littlecms.com/"
-SRC_URI="http://www.littlecms.com/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="jpeg python static-libs tiff zlib"
-
-RDEPEND="
-	tiff? ( >=media-libs/tiff-4.0.3-r6:0[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r11
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-"
-DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-1.3.31 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-disable_static_modules.patch"
-	"${FILESDIR}/${P}-implicit.patch"
-	"${FILESDIR}/${P}-fix-swig-destructor.patch"
-	"${FILESDIR}/${P}-fix-python3.2.patch"
-)
-
-src_prepare() {
-	# Breaks out-of-source build, only corresponding .in file is needed
-	rm include/icc34.h || die 'rm failed'
-
-	autotools-utils_src_prepare
-
-	# run swig to regenerate lcms_wrap.cxx and lcms.py (bug #148728)
-	if use python; then
-		cd python || die
-		bash swig_lcms || die
-	fi
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_with jpeg)
-		$(use_with tiff)
-		$(use_with zlib)
-	)
-	autotools-utils_src_configure --without-python
-
-	if multilib_is_native_abi && use python; then
-		python_parallel_foreach_impl \
-			autotools-utils_src_configure --with-python
-	fi
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use python; then
-		# Note: it intentionally passes evaluated 'parent' dir.
-		python_parallel_foreach_impl \
-			autotools-utils_src_compile -C python \
-			top_builddir="${BUILD_DIR}"
-	fi
-}
-
-multilib_src_test() {
-	cp "${S}"/testbed/*icm testbed/ || die
-
-	default
-}
-
-multilib_src_install() {
-	emake DESTDIR="${ED}" BINDIR="${ED}"/usr/bin install
-
-	if multilib_is_native_abi && use python; then
-		# Note: it intentionally passes evaluated 'parent' dir.
-		python_foreach_impl \
-			autotools-utils_src_install -C python \
-			top_builddir="${BUILD_DIR}"
-
-		python_parallel_foreach_impl python_optimize
-	fi
-
-	insinto /usr/share/lcms/profiles
-	doins "${S}"/testbed/*.icm
-}
-
-multilib_src_install_all() {
-	DOCS=( AUTHORS README.1ST INSTALL NEWS doc/{LCMSAPI,TUTORIAL}.TXT )
-
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-libs/lcms/lcms-1.19-r3.ebuild b/media-libs/lcms/lcms-1.19-r3.ebuild
deleted file mode 100644
index 40943cfba062..000000000000
--- a/media-libs/lcms/lcms-1.19-r3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.19-r3.ebuild,v 1.3 2015/04/08 17:59:35 mgorny Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-# autoreconf needs to update python macros for py3 support.
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-multilib python-r1
-
-DESCRIPTION="A lightweight, speed optimized color management engine"
-HOMEPAGE="http://www.littlecms.com/"
-SRC_URI="http://www.littlecms.com/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="jpeg python static-libs tiff zlib"
-
-RDEPEND="
-	tiff? ( >=media-libs/tiff-4.0.3-r6:0[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r11
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-"
-DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-1.3.31 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-disable_static_modules.patch"
-	"${FILESDIR}/${P}-implicit.patch"
-	"${FILESDIR}/${P}-fix-swig-destructor.patch"
-	"${FILESDIR}/${P}-fix-python3.2.patch"
-	"${FILESDIR}/${P}-cve-2013-4276.patch"
-)
-
-src_prepare() {
-	# Breaks out-of-source build, only corresponding .in file is needed
-	rm include/icc34.h || die 'rm failed'
-
-	autotools-utils_src_prepare
-
-	# run swig to regenerate lcms_wrap.cxx and lcms.py (bug #148728)
-	if use python; then
-		cd python || die
-		bash swig_lcms || die
-	fi
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_with jpeg)
-		$(use_with tiff)
-		$(use_with zlib)
-	)
-	autotools-utils_src_configure --without-python
-
-	if multilib_is_native_abi && use python; then
-		python_parallel_foreach_impl \
-			autotools-utils_src_configure --with-python
-	fi
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use python; then
-		# Note: it intentionally passes evaluated 'parent' dir.
-		python_parallel_foreach_impl \
-			autotools-utils_src_compile -C python \
-			top_builddir="${BUILD_DIR}"
-	fi
-}
-
-multilib_src_test() {
-	cp "${S}"/testbed/*icm testbed/ || die
-
-	default
-}
-
-multilib_src_install() {
-	emake DESTDIR="${ED}" BINDIR="${ED}"/usr/bin install
-
-	if multilib_is_native_abi && use python; then
-		# Note: it intentionally passes evaluated 'parent' dir.
-		python_foreach_impl \
-			autotools-utils_src_install -C python \
-			top_builddir="${BUILD_DIR}"
-
-		python_parallel_foreach_impl python_optimize
-	fi
-
-	insinto /usr/share/lcms/profiles
-	doins "${S}"/testbed/*.icm
-}
-
-multilib_src_install_all() {
-	DOCS=( AUTHORS README.1ST INSTALL NEWS doc/{LCMSAPI,TUTORIAL}.TXT )
-
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-libs/lcms/lcms-1.19.ebuild b/media-libs/lcms/lcms-1.19.ebuild
deleted file mode 100644
index bf9d405f9c4d..000000000000
--- a/media-libs/lcms/lcms-1.19.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.19.ebuild,v 1.18 2014/06/10 00:51:04 vapier Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit autotools eutils multilib python
-
-DESCRIPTION="A lightweight, speed optimized color management engine"
-HOMEPAGE="http://www.littlecms.com/"
-SRC_URI="http://www.littlecms.com/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="jpeg python static-libs tiff zlib"
-
-RDEPEND="tiff? ( media-libs/tiff:0 )
-	jpeg? ( virtual/jpeg:0 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-1.3.31 )"
-
-pkg_setup() {
-	if use python; then
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Python bindings are built/installed manually.
-	sed -e "/SUBDIRS =/s/ python//" -i Makefile.am
-
-	epatch "${FILESDIR}/${P}-disable_static_modules.patch"
-	epatch "${FILESDIR}/${P}-implicit.patch"
-
-	eautoreconf
-
-	# run swig to regenerate lcms_wrap.cxx and lcms.py (bug #148728)
-	if use python; then
-		cd python
-		./swig_lcms || die
-	fi
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		$(use_with jpeg) \
-		$(use_with python) \
-		$(use_with tiff) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		python_copy_sources python
-
-		building() {
-			emake \
-				LCMS_PYEXECDIR="${EPREFIX}$(python_get_sitedir)" \
-				LCMS_PYINCLUDE="${EPREFIX}$(python_get_includedir)" \
-				LCMS_PYLIB="${EPREFIX}$(python_get_libdir)" \
-				PYTHON_VERSION="$(python_get_version)"
-		}
-		python_execute_function -s --source-dir python building
-	fi
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		BINDIR="${ED}"/usr/bin \
-		libdir="${EPREFIX}"/usr/$(get_libdir) \
-		install || die
-
-	if use python; then
-		installation() {
-			emake \
-				DESTDIR="${D}" \
-				LCMS_PYEXECDIR="${EPREFIX}$(python_get_sitedir)" \
-				LCMS_PYLIB="${EPREFIX}$(python_get_libdir)" \
-				PYTHON_VERSION="$(python_get_version)" \
-				install
-		}
-		python_execute_function -s --source-dir python installation
-
-		python_clean_installation_image
-	fi
-
-	insinto /usr/share/lcms/profiles
-	doins testbed/*.icm
-
-	dodoc AUTHORS README* INSTALL NEWS doc/*
-
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize lcms.py
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup lcms.py
-	fi
-}