commit:     3ba53f4c1efe32adeb1591d1a83a48ec4a818470
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 25 15:54:31 2015 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Jan 25 15:54:31 2015 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=3ba53f4c

add media-libs/libjpeg-turbo from gentoo-x86

Package-Manager: portage-2.2.15
RepoMan-Options: --force
Manifest-Sign-Key: 072AD062

---
 media-libs/libjpeg-turbo/Manifest                  |  22 ++
 .../files/libjpeg-turbo-1.2.0-x32.patch            |  38 +++
 ...ibjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch |  38 +++
 .../files/libjpeg-turbo-1.3.1-jstdhuff.patch       | 301 +++++++++++++++++++++
 .../files/libjpeg-turbo-1.3.1-overrun.patch        |  21 ++
 .../libjpeg-turbo/libjpeg-turbo-1.3.0-r3.ebuild    | 122 +++++++++
 .../libjpeg-turbo/libjpeg-turbo-1.3.1-r1.ebuild    | 118 ++++++++
 .../libjpeg-turbo/libjpeg-turbo-1.3.1.ebuild       | 121 +++++++++
 media-libs/libjpeg-turbo/metadata.xml              |  13 +
 9 files changed, 794 insertions(+)

diff --git a/media-libs/libjpeg-turbo/Manifest 
b/media-libs/libjpeg-turbo/Manifest
new file mode 100644
index 0000000..9d17f8b
--- /dev/null
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -0,0 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX libjpeg-turbo-1.2.0-x32.patch 1240 SHA256 
b12ab8fbef2cd8ceafd2e26e8fca375894275b7a60216fabf23f4f1342e73347 SHA512 
0aa26467b7c0f583d945619f9b1ad9f200d6ae6cb5c904873a047d955de43c0bfefbf0d9f83cf26b3758f780b530cc35825b57a98856138642dcd29d73e24e91
 WHIRLPOOL 
67c84aec436f41f318149b264e5a198ad8b4d4bd19483f404dce60a59b237715a38fd5e6108d0c745ab90b6ca3688d2d75d7d23aecff06a649db34bff4d1be2d
+AUX libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch 1017 SHA256 
7fe595af3a0518376e0a209c4732a8e2832c0caa4a937741300b3440575f66ab SHA512 
ca01e4680267cfc79b8517c1ac55f15ef52b82299dad70b31eb18393be800fb524a12fe04048a63ad0f9881eaa7cefc879ad7f6bce04bb213ed0c4bfa6dd7040
 WHIRLPOOL 
3d7b95a7d0ed5cb263642e5e4cedfdaf0b74a516eae29b745e37763bd47b01ed2aac16d2ef6f9cd4d12fdb4691aea2afd3adb303024413ee2eec26df6ec5a3ed
+AUX libjpeg-turbo-1.3.1-jstdhuff.patch 11750 SHA256 
a787c3768e11ca3287c36f87860cd2930ca1ea01e61dfbcff94d9ce1e6a5ea7a SHA512 
3ace7a2e1ebd969135b665095a96b0fe1154869416fb4740d5a0588814a50e6c69e15ee3960fa7fe57c805cb4e2aa5cebadb347edf5583881d4cf20a17b9db5a
 WHIRLPOOL 
e92004dcea1fee19b9f10be40f117b9a3a0cc85bec92e30b9ebcc28312486ad6e66fcc2dc23deea6719aa93ecb1172cdcf986ae25e902c4a22d2e5974974b66b
+AUX libjpeg-turbo-1.3.1-overrun.patch 876 SHA256 
7521a75d9cd9b054b2a9e69098e5a1a903fdee56a43964275c4c5f5598246d85 SHA512 
727c981988d13740fb14617e189e4d7bec423f06a186f4d41f47d48e4cb6679edae62e9bcf79ba1a169e9bbf374f69f82cf4415ed00abbb5d8cf19489dd32113
 WHIRLPOOL 
efaba4a00fee68b9e059cd1e6d8f8efb8b3a03da7c74a597403ce472e4e0f7f4653fb61610d03cc3011e3f4112778096ad87ef5f019e35410a6b438a98c615ae
+DIST libjpeg-turbo-1.3.0.tar.gz 1361603 SHA256 
2657008cfc08aadbaca065bd9f8964b8a2c0abd03e73da5b5f09c1216be31234 SHA512 
4d34c3c5f2cdd70b2a3d1b55eeb4ce59cb3d4b8d22bb6d43c2ec844b7eb5685b55a9b1b46ad2bc5f2756b5f5535ccad032791c3b932af9c1efc502aa5e701053
 WHIRLPOOL 
13c1366b9bef87cab42c88f75d1ff7eddb4ea745e0056154f1f3fb27deedee077d662395bada3bd5c18d6f8bf744d0b1f3d465967d33b453ea2acc327a6f166f
+DIST libjpeg-turbo-1.3.1.tar.gz 1390282 SHA256 
c132907417ddc40ed552fe53d6b91d5fecbb14a356a60ddc7ea50d6be9666fb9 SHA512 
6b02dc617e291b357230ef3e8cfcd27f9acc8c3e9f1c869ab0a08e9e13711b87156c6cd1aaa1a6406a873fc6732f44c8a7d94a5d6688d24b14ac63a96ee52081
 WHIRLPOOL 
f978b24d0a4e63a421822c2114c0cfc87cbc1dedd648ddc2e97e24ee19dc5584433b1da7d41a64f0ae37b50799a273165aaec6f1377ed35a7971dbe8a0b6a8d5
+DIST libjpeg8_8d-1.debian.tar.gz 13676 SHA256 
70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057 SHA512 
7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040
 WHIRLPOOL 
94526c31d401eb14c9bf0f7115e13a27886ad58863e25d6653eba2b2f5ef260ec272368d2b9d9934bd75b1e5b5f1afc97230e540248efc24d6e85e5680399d27
+DIST libjpeg8_8d-2.debian.tar.gz 14764 SHA256 
9b36468b2aba24d63d3c87625de89f31834ac429e6dec7d68d86a52b5110219c SHA512 
8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
 WHIRLPOOL 
bda41c37f3f57733fcd86969126f6dbede2fbf633b0168265a7fe353fb7f3cd995a94e7987bac472957ec6fb0b2dc34d5dd646f0de79e06bc94e59d7cf440939
+EBUILD libjpeg-turbo-1.3.0-r3.ebuild 3166 SHA256 
d2658a5ed6c87f1ca4ff939198f3b36f129a6be28c855db91b7930a0b82c20e9 SHA512 
9e89708eddbdf5c70d70395c3ddab8aee776ea28fc6f18f98e2755ac12dd85467f872b3b5a89fa462f4990a8f718d864d628ae00b3577e614cc8fedcfad78f2c
 WHIRLPOOL 
0fb19a29ec010cd3c6a9eeb5200e3495268ed4a0fa9124b352a1fb05ec2bda4699155944d7af0b100fab53d8b5a5db231311b89825d0c9f21bae5e2111908ed6
+EBUILD libjpeg-turbo-1.3.1-r1.ebuild 3218 SHA256 
84e7b7a04d282c8443e2f205fd857b645f66f66e030f4cb9f44f64930dff09b6 SHA512 
df89aea579886015860fbf12bb9741a78eb8ce870d0f0732c8daceeaaa771546caca31ea672cedb5ce94ec7652dc14bd57ececcb2f4259a97aa7d7d10f7d9407
 WHIRLPOOL 
c97b98773c3b9898622ab294b2050e347d9a5da90bd6a939bb9245bd795be44eeb280f20c32fa14afd2e1ce05d5101e25993787b0489f2ca4fcd02c7b64c90ac
+EBUILD libjpeg-turbo-1.3.1.ebuild 3113 SHA256 
e9a62cdd14d42c531d22f81ce08cce3df527d65d08455a2f2572a0599031ae1c SHA512 
5848aecc33e897b5ccfecbf171a3f9ec2343c38747dc2b86432ccb5df4a2bd9717d443c56b312b620ede94638458a94ba563be5decfa84904f1144a642156bcd
 WHIRLPOOL 
32199f6f760e8504c6e3e5b115a40e6432ac6c3b4b9f9df5eb2b876b41c1fa04196de7e98657fc211a0c15981053cdbb55f55ad714ddbac2b3a5834e18141c27
+MISC metadata.xml 367 SHA256 
6b8c81649360de8af20a434749d90a9ee689026f959c814e22dac83513c5b0d4 SHA512 
0dc1a5f70e560471119207724bc0015d1ae6b80c7da5d2305479b681ae9dca487dc0a58b5db45cc033d3c12ec997902b1c42c664efbfdff8cf3e1570259d0835
 WHIRLPOOL 
5686f917bfedc7f73923a18e99e8fa64eadda2cbe476d8b6c527be83f283acad01e0fedb5d4c9deb1dbf4f21538b69b3446db3304af782fb76e4b009c6bd3822
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlTFEbcACgkQkKaRLQcq0GKafwCeO0VccRn7ToG93yscODYM6Bc1
+3TQAnj9swORJysrO1Od55t2DQF5RWgsc
+=y9wC
+-----END PGP SIGNATURE-----

diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch 
b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch
new file mode 100644
index 0000000..d85a4d7
--- /dev/null
+++ b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/420239
+
+https://sourceforge.net/tracker/?func=detail&aid=3533795&group_id=303195&atid=1278160
+
+--- configure
++++ configure
+@@ -33,7 +33,11 @@ case "$host_os" in
+   linux*)
+     case "$host_cpu" in
+       x86_64)
+-        objfmt='ELF64'
++        if echo __ILP32__ | $CC $CFLAGS -E - | grep __ILP32__ > /dev/null; 
then
++          objfmt='ELF64'
++        else
++          objfmt='ELFX32'
++        fi
+         ;;
+       *)
+         objfmt='ELF'
+@@ -94,6 +98,7 @@ case "$objfmt" in
+   a.out)      NAFLAGS='-faout -DAOUT';;
+   BSD-a.out)  NAFLAGS='-faoutb -DAOUT';;
+   ELF)        NAFLAGS='-felf -DELF';;
++  ELFX32)     NAFLAGS='-felfx32 -DELF -D__x86_64__';;
+   ELF64)      NAFLAGS='-felf64 -DELF -D__x86_64__';;
+   RDF)        NAFLAGS='-frdf -DRDF';;
+   Mach-O)     NAFLAGS='-fmacho -DMACHO';;
+--- simd/nasm_lt.sh
++++ simd/nasm_lt.sh
+@@ -11,7 +11,7 @@ while [ $# -gt 0 ]; do
+                 pic=yes
+             fi
+             ;;
+-        -f|-fbin|-faout|-faoutb|-fcoff|-felf|-felf64|-fas86| \
++        -f|-fbin|-faout|-faoutb|-fcoff|-felf|-felf64|-felfx32|-fas86| \
+         -fobj|-fwin32|-fwin64|-frdf|-fieee|-fmacho|-fmacho64)
+             # it's a file format specifier for nasm.
+             command="$command $1"

diff --git 
a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch
 
b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch
new file mode 100644
index 0000000..46eefad
--- /dev/null
+++ 
b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch
@@ -0,0 +1,38 @@
+http://bugzilla.redhat.com/show_bug.cgi?id=1031734
+http://bugzilla.redhat.com/show_bug.cgi?id=1031749
+http://sourceforge.net/p/libjpeg-turbo/code/1090/
+
+--- jdmarker.c
++++ jdmarker.c
+@@ -304,7 +304,7 @@
+ /* Process a SOS marker */
+ {
+   INT32 length;
+-  int i, ci, n, c, cc;
++  int i, ci, n, c, cc, pi;
+   jpeg_component_info * compptr;
+   INPUT_VARS(cinfo);
+ 
+@@ -348,6 +348,13 @@
+     
+     TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc,
+            compptr->dc_tbl_no, compptr->ac_tbl_no);
++
++    /* This CSi (cc) should differ from the previous CSi */
++    for (pi = 0; pi < i; pi++) {
++      if (cinfo->cur_comp_info[pi] == compptr) {
++        ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc);
++      }
++    }
+   }
+ 
+   /* Collect the additional scan parameters Ss, Se, Ah/Al. */
+@@ -465,6 +472,8 @@
+     for (i = 0; i < count; i++)
+       INPUT_BYTE(cinfo, huffval[i], return FALSE);
+ 
++    MEMZERO(&huffval[count], (256 - count) * SIZEOF(UINT8));
++
+     length -= count;
+ 
+     if (index & 0x10) {               /* AC table definition */

diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.3.1-jstdhuff.patch 
b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.3.1-jstdhuff.patch
new file mode 100644
index 0000000..764147d
--- /dev/null
+++ b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.3.1-jstdhuff.patch
@@ -0,0 +1,301 @@
+Index: jcparam.c
+===================================================================
+--- jcparam.c  (revision 1103)
++++ jcparam.c  (revision 1104)
+@@ -16,6 +16,7 @@
+ #define JPEG_INTERNALS
+ #include "jinclude.h"
+ #include "jpeglib.h"
++#include "jstdhuff.c"
+ 
+ 
+ /*
+@@ -166,116 +167,6 @@
+ 
+ 
+ /*
+- * Huffman table setup routines
+- */
+-
+-LOCAL(void)
+-add_huff_table (j_compress_ptr cinfo,
+-              JHUFF_TBL **htblptr, const UINT8 *bits, const UINT8 *val)
+-/* Define a Huffman table */
+-{
+-  int nsymbols, len;
+-
+-  if (*htblptr == NULL)
+-    *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
+-
+-  /* Copy the number-of-symbols-of-each-code-length counts */
+-  MEMCOPY((*htblptr)->bits, bits, SIZEOF((*htblptr)->bits));
+-
+-  /* Validate the counts.  We do this here mainly so we can copy the right
+-   * number of symbols from the val[] array, without risking marching off
+-   * the end of memory.  jchuff.c will do a more thorough test later.
+-   */
+-  nsymbols = 0;
+-  for (len = 1; len <= 16; len++)
+-    nsymbols += bits[len];
+-  if (nsymbols < 1 || nsymbols > 256)
+-    ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
+-
+-  MEMCOPY((*htblptr)->huffval, val, nsymbols * SIZEOF(UINT8));
+-
+-  /* Initialize sent_table FALSE so table will be written to JPEG file. */
+-  (*htblptr)->sent_table = FALSE;
+-}
+-
+-
+-LOCAL(void)
+-std_huff_tables (j_compress_ptr cinfo)
+-/* Set up the standard Huffman tables (cf. JPEG standard section K.3) */
+-/* IMPORTANT: these are only valid for 8-bit data precision! */
+-{
+-  static const UINT8 bits_dc_luminance[17] =
+-    { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 };
+-  static const UINT8 val_dc_luminance[] =
+-    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
+-  
+-  static const UINT8 bits_dc_chrominance[17] =
+-    { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 };
+-  static const UINT8 val_dc_chrominance[] =
+-    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
+-  
+-  static const UINT8 bits_ac_luminance[17] =
+-    { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d };
+-  static const UINT8 val_ac_luminance[] =
+-    { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,
+-      0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
+-      0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
+-      0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0,
+-      0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,
+-      0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,
+-      0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
+-      0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
+-      0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
+-      0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
+-      0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
+-      0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
+-      0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,
+-      0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
+-      0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
+-      0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5,
+-      0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4,
+-      0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
+-      0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea,
+-      0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
+-      0xf9, 0xfa };
+-  
+-  static const UINT8 bits_ac_chrominance[17] =
+-    { /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 };
+-  static const UINT8 val_ac_chrominance[] =
+-    { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,
+-      0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,
+-      0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
+-      0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,
+-      0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34,
+-      0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,
+-      0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38,
+-      0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
+-      0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
+-      0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
+-      0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
+-      0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+-      0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,
+-      0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
+-      0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
+-      0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3,
+-      0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,
+-      0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
+-      0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
+-      0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
+-      0xf9, 0xfa };
+-  
+-  add_huff_table(cinfo, &cinfo->dc_huff_tbl_ptrs[0],
+-               bits_dc_luminance, val_dc_luminance);
+-  add_huff_table(cinfo, &cinfo->ac_huff_tbl_ptrs[0],
+-               bits_ac_luminance, val_ac_luminance);
+-  add_huff_table(cinfo, &cinfo->dc_huff_tbl_ptrs[1],
+-               bits_dc_chrominance, val_dc_chrominance);
+-  add_huff_table(cinfo, &cinfo->ac_huff_tbl_ptrs[1],
+-               bits_ac_chrominance, val_ac_chrominance);
+-}
+-
+-
+-/*
+  * Default parameter setup for compression.
+  *
+  * Applications that don't choose to use this routine must do their
+@@ -313,7 +204,7 @@
+   /* Set up two quantization tables using default quality of 75 */
+   jpeg_set_quality(cinfo, 75, TRUE);
+   /* Set up two Huffman tables */
+-  std_huff_tables(cinfo);
++  std_huff_tables((j_common_ptr) cinfo);
+ 
+   /* Initialize default arithmetic coding conditioning */
+   for (i = 0; i < NUM_ARITH_TBLS; i++) {
+Index: jstdhuff.c
+===================================================================
+--- jstdhuff.c (revision 0)
++++ jstdhuff.c (revision 1104)
+@@ -0,0 +1,133 @@
++/*
++* jstdhuff.c
++*
++* This file was part of the Independent JPEG Group's software:
++* Copyright (C) 1991-1998, Thomas G. Lane.
++* libjpeg-turbo Modifications:
++* Copyright (C) 2013, D. R. Commander.
++* For conditions of distribution and use, see the accompanying README file.
++*
++* This file contains routines to set the default Huffman tables, if they are
++* not already set.
++*/ 
++
++/*
++ * Huffman table setup routines
++ */
++
++LOCAL(void)
++add_huff_table (j_common_ptr cinfo,
++              JHUFF_TBL **htblptr, const UINT8 *bits, const UINT8 *val)
++/* Define a Huffman table */
++{
++  int nsymbols, len;
++
++  if (*htblptr == NULL)
++    *htblptr = jpeg_alloc_huff_table(cinfo);
++  else
++    return;
++
++  /* Copy the number-of-symbols-of-each-code-length counts */
++  MEMCOPY((*htblptr)->bits, bits, SIZEOF((*htblptr)->bits));
++
++  /* Validate the counts.  We do this here mainly so we can copy the right
++   * number of symbols from the val[] array, without risking marching off
++   * the end of memory.  jchuff.c will do a more thorough test later.
++   */
++  nsymbols = 0;
++  for (len = 1; len <= 16; len++)
++    nsymbols += bits[len];
++  if (nsymbols < 1 || nsymbols > 256)
++    ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
++
++  MEMCOPY((*htblptr)->huffval, val, nsymbols * SIZEOF(UINT8));
++
++  /* Initialize sent_table FALSE so table will be written to JPEG file. */
++  (*htblptr)->sent_table = FALSE;
++}
++
++
++LOCAL(void)
++std_huff_tables (j_common_ptr cinfo)
++/* Set up the standard Huffman tables (cf. JPEG standard section K.3) */
++/* IMPORTANT: these are only valid for 8-bit data precision! */
++{
++  JHUFF_TBL **dc_huff_tbl_ptrs, **ac_huff_tbl_ptrs;
++
++  static const UINT8 bits_dc_luminance[17] =
++    { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 };
++  static const UINT8 val_dc_luminance[] =
++    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
++  
++  static const UINT8 bits_dc_chrominance[17] =
++    { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 };
++  static const UINT8 val_dc_chrominance[] =
++    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
++  
++  static const UINT8 bits_ac_luminance[17] =
++    { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d };
++  static const UINT8 val_ac_luminance[] =
++    { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,
++      0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
++      0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
++      0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0,
++      0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,
++      0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,
++      0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
++      0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
++      0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
++      0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
++      0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
++      0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
++      0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,
++      0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
++      0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
++      0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5,
++      0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4,
++      0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
++      0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea,
++      0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
++      0xf9, 0xfa };
++  
++  static const UINT8 bits_ac_chrominance[17] =
++    { /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 };
++  static const UINT8 val_ac_chrominance[] =
++    { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,
++      0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,
++      0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
++      0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,
++      0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34,
++      0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,
++      0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38,
++      0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
++      0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
++      0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
++      0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
++      0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
++      0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,
++      0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
++      0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
++      0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3,
++      0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,
++      0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
++      0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
++      0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
++      0xf9, 0xfa };
++
++  if (cinfo->is_decompressor) {
++    dc_huff_tbl_ptrs = ((j_decompress_ptr)cinfo)->dc_huff_tbl_ptrs;
++    ac_huff_tbl_ptrs = ((j_decompress_ptr)cinfo)->ac_huff_tbl_ptrs;
++  } else {
++    dc_huff_tbl_ptrs = ((j_compress_ptr)cinfo)->dc_huff_tbl_ptrs;
++    ac_huff_tbl_ptrs = ((j_compress_ptr)cinfo)->ac_huff_tbl_ptrs;
++  }
++
++  add_huff_table(cinfo, &dc_huff_tbl_ptrs[0], bits_dc_luminance,
++                 val_dc_luminance);
++  add_huff_table(cinfo, &ac_huff_tbl_ptrs[0], bits_ac_luminance,
++                 val_ac_luminance);
++  add_huff_table(cinfo, &dc_huff_tbl_ptrs[1], bits_dc_chrominance,
++                 val_dc_chrominance);
++  add_huff_table(cinfo, &ac_huff_tbl_ptrs[1], bits_ac_chrominance,
++                 val_ac_chrominance);
++}
+Index: jdhuff.c
+===================================================================
+--- jdhuff.c   (revision 1103)
++++ jdhuff.c   (revision 1104)
+@@ -21,6 +21,7 @@
+ #include "jpeglib.h"
+ #include "jdhuff.h"           /* Declarations shared with jdphuff.c */
+ #include "jpegcomp.h"
++#include "jstdhuff.c"
+ 
+ 
+ /*
+@@ -795,6 +796,12 @@
+   huff_entropy_ptr entropy;
+   int i;
+ 
++  /* Motion JPEG frames typically do not include the Huffman tables if they
++     are the default tables.  Thus, if the tables are not set by the time
++     the Huffman decoder is initialized (usually within the body of
++     jpeg_start_decompress()), we set them to default values. */
++  std_huff_tables((j_common_ptr) cinfo);
++
+   entropy = (huff_entropy_ptr)
+     (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+                               SIZEOF(huff_entropy_decoder));

diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.3.1-overrun.patch 
b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.3.1-overrun.patch
new file mode 100644
index 0000000..92f48c3
--- /dev/null
+++ b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.3.1-overrun.patch
@@ -0,0 +1,21 @@
+diff -Naur old/jchuff.c new/jchuff.c
+--- old/jchuff.c       2014-11-27 06:48:21.009442853 -1000
++++ new/jchuff.c       2014-11-27 06:48:46.289700004 -1000
+@@ -391,7 +391,16 @@
+ #endif
+ 
+ 
+-#define BUFSIZE (DCTSIZE2 * 2)
++/* Although it is exceedingly rare, it is possible for a Huffman-encoded
++ * coefficient block to be larger than the 128-byte unencoded block.  For each
++ * of the 64 coefficients, PUT_BITS is invoked twice, and each invocation can
++ * theoretically store 16 bits (for a maximum of 2048 bits or 256 bytes per
++ * encoded block.)  If, for instance, one artificially sets the AC
++ * coefficients to alternating values of 32767 and -32768 (using the JPEG
++ * scanning order-- 1, 8, 16, etc.), then this will produce an encoded block
++ * larger than 200 bytes.
++ */
++#define BUFSIZE (DCTSIZE2 * 4)
+ 
+ #define LOAD_BUFFER() { \
+   if (state->free_in_buffer < BUFSIZE) { \

diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r3.ebuild 
b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r3.ebuild
new file mode 100644
index 0000000..f6886b7
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r3.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: 
/var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r3.ebuild,v
 1.11 2014/06/09 23:31:28 vapier Exp $
+
+EAPI=5
+
+inherit autotools eutils java-pkg-opt-2 libtool toolchain-funcs 
multilib-minimal
+
+DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
+HOMEPAGE="http://libjpeg-turbo.virtualgl.org/ 
http://sourceforge.net/projects/libjpeg-turbo/";
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+       mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz"
+
+LICENSE="BSD IJG"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="java static-libs"
+
+ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
+COMMON_DEPEND="!media-libs/jpeg:0
+       !media-libs/jpeg:62
+       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5
+               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND="${COMMON_DEPEND}
+       java? ( >=virtual/jre-1.5 )"
+DEPEND="${COMMON_DEPEND}
+       amd64? ( ${ASM_DEPEND} )
+       x86? ( ${ASM_DEPEND} )
+       amd64-fbsd? ( ${ASM_DEPEND} )
+       x86-fbsd? ( ${ASM_DEPEND} )
+       amd64-linux? ( ${ASM_DEPEND} )
+       x86-linux? ( ${ASM_DEPEND} )
+       x64-macos? ( ${ASM_DEPEND} )
+       java? ( >=virtual/jdk-1.5 )"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239
+       epatch "${FILESDIR}"/${P}-CVE-2013-6629-and-6630.patch
+
+       if [[ -x ./configure ]]; then
+               elibtoolize
+       else
+               eautoreconf
+       fi
+
+       epunt_cxx #424689
+
+       java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+       local myconf=()
+       if multilib_is_native_abi; then
+               myconf+=( $(use_with java) )
+               if use java; then
+                       export JAVACFLAGS="$(java-pkg_javac-args)"
+                       export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+               fi
+       else
+               myconf+=( --without-java )
+       fi
+       [[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239
+
+       ECONF_SOURCE=${S} \
+       econf \
+               $(use_enable static-libs static) \
+               --with-mem-srcdst \
+               "${myconf[@]}"
+}
+
+multilib_src_compile() {
+       local _java_makeopts
+       use java && _java_makeopts="-j1"
+       emake ${_java_makeopts}
+
+       if multilib_is_native_abi; then
+               pushd ../debian/extra >/dev/null
+               emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
+               popd >/dev/null
+       fi
+}
+
+multilib_src_test() {
+       emake test
+}
+
+multilib_src_install() {
+       emake \
+               DESTDIR="${D}" \
+               docdir="${EPREFIX}"/usr/share/doc/${PF} \
+               exampledir="${EPREFIX}"/usr/share/doc/${PF} \
+               install
+
+       if multilib_is_native_abi; then
+               pushd "${WORKDIR}"/debian/extra >/dev/null
+               emake \
+                       DESTDIR="${D}" prefix="${EPREFIX}"/usr \
+                       INSTALL="install -m755" INSTALLDIR="install -d -m755" \
+                       install
+               popd >/dev/null
+
+               if use java; then
+                       rm -rf "${ED}"/usr/classes
+                       java-pkg_dojar java/turbojpeg.jar
+               fi
+       fi
+}
+
+multilib_src_install_all() {
+       prune_libtool_files
+
+       insinto /usr/share/doc/${PF}/html
+       doins -r "${S}"/doc/html/*
+       newdoc "${WORKDIR}"/debian/changelog changelog.debian
+       if use java; then
+               insinto /usr/share/doc/${PF}/html/java
+               doins -r "${S}"/java/doc/*
+               newdoc "${S}"/java/README README.java
+       fi
+}

diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1-r1.ebuild 
b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1-r1.ebuild
new file mode 100644
index 0000000..9061853
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: 
/var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1-r1.ebuild,v
 1.2 2015/01/08 00:15:53 remi Exp $
+
+EAPI=5
+
+inherit autotools eutils java-pkg-opt-2 libtool toolchain-funcs 
multilib-minimal
+
+DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
+HOMEPAGE="http://libjpeg-turbo.virtualgl.org/ 
http://sourceforge.net/projects/libjpeg-turbo/";
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+       mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-2.debian.tar.gz"
+
+LICENSE="BSD IJG"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux 
~x64-macos ~x86-macos"
+IUSE="java static-libs"
+
+ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
+COMMON_DEPEND="!media-libs/jpeg:0
+       !media-libs/jpeg:62
+       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5
+               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND="${COMMON_DEPEND}
+       java? ( >=virtual/jre-1.5 )"
+DEPEND="${COMMON_DEPEND}
+       amd64? ( ${ASM_DEPEND} )
+       x86? ( ${ASM_DEPEND} )
+       amd64-fbsd? ( ${ASM_DEPEND} )
+       x86-fbsd? ( ${ASM_DEPEND} )
+       amd64-linux? ( ${ASM_DEPEND} )
+       x86-linux? ( ${ASM_DEPEND} )
+       x64-macos? ( ${ASM_DEPEND} )
+       java? ( >=virtual/jdk-1.5 )"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239
+       epatch "${FILESDIR}"/${PN}-1.3.1-jstdhuff.patch
+       epatch "${FILESDIR}"/${PN}-1.3.1-overrun.patch
+
+       # generate a new ./configure compatible with non-bash shells, #533902
+       eautoreconf
+
+       java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+       local myconf=()
+       if multilib_is_native_abi; then
+               myconf+=( $(use_with java) )
+               if use java; then
+                       export JAVACFLAGS="$(java-pkg_javac-args)"
+                       export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+               fi
+       else
+               myconf+=( --without-java )
+       fi
+       [[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239
+
+       ECONF_SOURCE=${S} \
+       econf \
+               $(use_enable static-libs static) \
+               --with-mem-srcdst \
+               "${myconf[@]}"
+}
+
+multilib_src_compile() {
+       local _java_makeopts
+       use java && _java_makeopts="-j1"
+       emake ${_java_makeopts}
+
+       if multilib_is_native_abi; then
+               pushd ../debian/extra >/dev/null
+               emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
+               popd >/dev/null
+       fi
+}
+
+multilib_src_test() {
+       emake test
+}
+
+multilib_src_install() {
+       emake \
+               DESTDIR="${D}" \
+               docdir="${EPREFIX}"/usr/share/doc/${PF} \
+               exampledir="${EPREFIX}"/usr/share/doc/${PF} \
+               install
+
+       if multilib_is_native_abi; then
+               pushd "${WORKDIR}"/debian/extra >/dev/null
+               emake \
+                       DESTDIR="${D}" prefix="${EPREFIX}"/usr \
+                       INSTALL="install -m755" INSTALLDIR="install -d -m755" \
+                       install
+               popd >/dev/null
+
+               if use java; then
+                       rm -rf "${ED}"/usr/classes
+                       java-pkg_dojar java/turbojpeg.jar
+               fi
+       fi
+}
+
+multilib_src_install_all() {
+       prune_libtool_files
+
+       insinto /usr/share/doc/${PF}/html
+       doins -r "${S}"/doc/html/*
+       newdoc "${WORKDIR}"/debian/changelog changelog.debian
+       if use java; then
+               insinto /usr/share/doc/${PF}/html/java
+               doins -r "${S}"/java/doc/*
+               newdoc "${S}"/java/README README.java
+       fi
+}

diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1.ebuild 
b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1.ebuild
new file mode 100644
index 0000000..5ffdfb4
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: 
/var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1.ebuild,v 
1.9 2014/08/01 16:31:13 tgall Exp $
+
+EAPI=5
+
+inherit autotools eutils java-pkg-opt-2 libtool toolchain-funcs 
multilib-minimal
+
+DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
+HOMEPAGE="http://libjpeg-turbo.virtualgl.org/ 
http://sourceforge.net/projects/libjpeg-turbo/";
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+       mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-2.debian.tar.gz"
+
+LICENSE="BSD IJG"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos 
~x86-macos"
+IUSE="java static-libs"
+
+ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
+COMMON_DEPEND="!media-libs/jpeg:0
+       !media-libs/jpeg:62
+       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5
+               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND="${COMMON_DEPEND}
+       java? ( >=virtual/jre-1.5 )"
+DEPEND="${COMMON_DEPEND}
+       amd64? ( ${ASM_DEPEND} )
+       x86? ( ${ASM_DEPEND} )
+       amd64-fbsd? ( ${ASM_DEPEND} )
+       x86-fbsd? ( ${ASM_DEPEND} )
+       amd64-linux? ( ${ASM_DEPEND} )
+       x86-linux? ( ${ASM_DEPEND} )
+       x64-macos? ( ${ASM_DEPEND} )
+       java? ( >=virtual/jdk-1.5 )"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239
+
+       if [[ -x ./configure ]]; then
+               elibtoolize
+       else
+               eautoreconf
+       fi
+
+       epunt_cxx #424689
+
+       java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+       local myconf=()
+       if multilib_is_native_abi; then
+               myconf+=( $(use_with java) )
+               if use java; then
+                       export JAVACFLAGS="$(java-pkg_javac-args)"
+                       export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+               fi
+       else
+               myconf+=( --without-java )
+       fi
+       [[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239
+
+       ECONF_SOURCE=${S} \
+       econf \
+               $(use_enable static-libs static) \
+               --with-mem-srcdst \
+               "${myconf[@]}"
+}
+
+multilib_src_compile() {
+       local _java_makeopts
+       use java && _java_makeopts="-j1"
+       emake ${_java_makeopts}
+
+       if multilib_is_native_abi; then
+               pushd ../debian/extra >/dev/null
+               emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
+               popd >/dev/null
+       fi
+}
+
+multilib_src_test() {
+       emake test
+}
+
+multilib_src_install() {
+       emake \
+               DESTDIR="${D}" \
+               docdir="${EPREFIX}"/usr/share/doc/${PF} \
+               exampledir="${EPREFIX}"/usr/share/doc/${PF} \
+               install
+
+       if multilib_is_native_abi; then
+               pushd "${WORKDIR}"/debian/extra >/dev/null
+               emake \
+                       DESTDIR="${D}" prefix="${EPREFIX}"/usr \
+                       INSTALL="install -m755" INSTALLDIR="install -d -m755" \
+                       install
+               popd >/dev/null
+
+               if use java; then
+                       rm -rf "${ED}"/usr/classes
+                       java-pkg_dojar java/turbojpeg.jar
+               fi
+       fi
+}
+
+multilib_src_install_all() {
+       prune_libtool_files
+
+       insinto /usr/share/doc/${PF}/html
+       doins -r "${S}"/doc/html/*
+       newdoc "${WORKDIR}"/debian/changelog changelog.debian
+       if use java; then
+               insinto /usr/share/doc/${PF}/html/java
+               doins -r "${S}"/java/doc/*
+               newdoc "${S}"/java/README README.java
+       fi
+}

diff --git a/media-libs/libjpeg-turbo/metadata.xml 
b/media-libs/libjpeg-turbo/metadata.xml
new file mode 100644
index 0000000..2df8087
--- /dev/null
+++ b/media-libs/libjpeg-turbo/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+  <herd>graphics</herd>
+  <maintainer>
+    <email>ssuomi...@gentoo.org</email>
+    <name>Samuli Suominen</name>
+  </maintainer>
+  <maintainer>
+    <email>anar...@gentoo.org</email>
+    <name>Jory A. Pratt</name>
+  </maintainer>
+</pkgmetadata>

Reply via email to