Add png15 support and don't build static libs

(Portage version: 2.2.0_alpha62/git/Linux x86_64, signed Manifest commit with key 70EB7916)

4 files changed, 43 insertions, 7 deletions

diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index 7f7c6e467..164b64e11 100644
--- a/sci-chemistry/coot/ChangeLog
+++ b/sci-chemistry/coot/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Oct 2011; Justin Lecher <jlec@gentoo.org> +files/9999-libpng-1.5.patch,
+  coot-9999.ebuild:
+  Add png15 support and don't build static libs
+
   16 Jul 2011; Justin Lecher <jlec@gentoo.org> +files/9999-ssm.patch,
   coot-9999.ebuild:
   Adopt to unbundled ssm
diff --git a/sci-chemistry/coot/Manifest b/sci-chemistry/coot/Manifest
index df9f5aff9..660101961 100644
--- a/sci-chemistry/coot/Manifest
+++ b/sci-chemistry/coot/Manifest
@@ -5,18 +5,19 @@ AUX 9999-clipper-config.patch 431 RMD160 7a00939760bc4c062bbde1a65f53b9556b93c3b
 AUX 9999-gl.patch 383 RMD160 6460e87e4da57ff845f96f072dec1354ed117bee SHA1 00bc0bbfc7d4fb00ebc8477941469bef2ed6b670 SHA256 9d47a6cf2d0c7644b945f88acdc7af146df4f9a5a8f883a0e72e1bc8ccf8b380
 AUX 9999-goocanvas.patch 702 RMD160 9b26975eb658f15dfd806e47be9c11bcb7f850db SHA1 37bb70847ced34b754fe7cf5fea878b93bb6ed12 SHA256 162b21a3afb2d523df315ec021faf7a6497eb3b4fe00f90f601527fe1c22621a
 AUX 9999-include.patch 345 RMD160 6e42ce2afa7141f9cdcda0ca3ea5a11ef4f0f15f SHA1 3df3955307115ed8527f55fb49452905991c36cc SHA256 07b61fb298da857c5c37abb492cf192c65f9b538a3fc2d316aca7f4269e25a75
+AUX 9999-libpng-1.5.patch 1396 RMD160 a7295bf9b312df0f19f82aec3f9458b4d7881606 SHA1 dfa904f324398cc4c7169ec223fb1cec9e72f482 SHA256 e1a1a172f92702aab5921943201baeba36643f9c5bbf1aa40151c4d4dd9dfee6
 AUX 9999-lidia.patch 518 RMD160 bc1ac82f5d0e1c51f5cebaceb758ca306ea638d9 SHA1 7eb4f7e08ab0aea2f94d2ef27f26fc2aa796f21e SHA256 4b0cc3ed5a0a21cc9af5c2148779a6b82d2ad555720843af237efe0a3cc15be8
 AUX 9999-mmdb-config.patch 479 RMD160 8026b5420940726547200e51db7ce82d7706702c SHA1 e1b1c9ea87fdb2fa5d6c7301d397986d6a9afc4a SHA256 0b7d61f9c5f9664672286e82a790d4dea1673ed1537ef62b59142ced97685d82
 AUX 9999-ssm.patch 1276 RMD160 8c7eef0034efc2c57bd774fe8ebb1bd0ba9c7aa2 SHA1 8812f35fba16a45b21ecce5243fd26d6105e29e3 SHA256 42f1098b0d56f85125293ca24410061e7a9bee10c94ba6e9fd3496439368bf75
 AUX 9999-test.patch 457 RMD160 1a3e0956d8b7f051fdd964524c0ba9eabf8c2aca SHA1 a8f9584be09cc58e7cb55801115e9649b05aa910 SHA256 494ef09e407c3047145c250c70b90c7679a1c5b9f84c57a680e40580bd980397
-DIST greg-data.tar.gz 8044588 RMD160 3613c453ddc3d7f7cfb9e018a82d0f7581b05038 SHA1 d0a5f6f024fc08087620ab0c83747cc66e3cd436 SHA256 6dbb4edfa6d00a1b27ebbcc1c98b95abd041653fdb4521ca3c14e0000eec8b4c
-EBUILD coot-9999.ebuild 4190 RMD160 4b1fed17901575b6762f20b287e6b45e39687973 SHA1 55f02812ab2b7cf7e7ba022772ee812831fcf149 SHA256 0cc0ee6cd568a28a8e3b83594c07dc79996ed329cdfe5616fd4c4068405fbffa
-MISC ChangeLog 10450 RMD160 1a47936b2c3a2ebf9b9c5d970ef081b309cd478d SHA1 1440ade284008acf1fd30ca2f89f401546cbefe3 SHA256 f778a13ca3c564b3ff2ac3924dfb25131689987719c47e8f4121360ab25a3a18
+DIST greg-data.tar.gz 8045698 RMD160 c656248cfa9393c2d112fe6f4ac4ad0f92105079 SHA1 35d66df183e062cc87a32fdfde28d62235024a24 SHA256 2d3834f9df5f5351c7836d10cc9ceb83365241606cfb5541ceffc6e3db459c9f
+EBUILD coot-9999.ebuild 4249 RMD160 4f4cef2d2291694da8ca804ef28789973882c182 SHA1 d0b5f2c410b0cda9924b9410a760b450cfa58246 SHA256 900b68027211fea5f77cc8a4f72191c3f58610e8869ad2cb1ace06e31c771e0e
+MISC ChangeLog 10596 RMD160 87d55de75329dca791805f15b4a39dcbc64c6b8f SHA1 34141ec50bcdd64f2892232123612d339d4b2ecc SHA256 eb2261c3088769a422198e0c0d801425bbd3718126375eae6037e5f14609001c
 MISC metadata.xml 309 RMD160 62b0b67572300bd5b40f1ac76c9e198b1b241391 SHA1 cf618b7b327adc672fa00a392e96a3c60ce4b8db SHA256 1adfc298fdb6b02eac868761ad3ce2b93074cb83a61b730dc39fe6bfa7f51142
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk4hlf0ACgkQgAnW8HDreRaLqgCfSZ8svfrbKclRWCP4EJfDUzqp
-jiEAoJLPIdEHCfxUm89AUiwkuCdpULy3
-=UEop
+iEYEAREKAAYFAk6OEp8ACgkQgAnW8HDreRaSJQCeJS6diAgbg4ipO6NLA4Ko0z2i
+QosAoINXkN9mkc2Rysfvm0QIylTsRfM7
+=ryIY
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coot-9999.ebuild
index 93859d2d8..c3f3455a1 100644
--- a/sci-chemistry/coot/coot-9999.ebuild
+++ b/sci-chemistry/coot/coot-9999.ebuild
@@ -84,6 +84,7 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-mmdb-config.patch
 	"${FILESDIR}"/${PV}-test.patch
 	"${FILESDIR}"/${PV}-ssm.patch
+	"${FILESDIR}"/${PV}-libpng-1.5.patch
 	)
 
 src_unpack() {
@@ -109,6 +110,7 @@ src_configure() {
 	# All the --with's are used to activate various parts.
 	# Yes, this is broken behavior.
 	econf \
+		--disable-static \
 		--includedir='${prefix}/include/coot' \
 		--with-gtkcanvas-prefix="${EPREFIX}/usr" \
 		--with-gtkgl-prefix="${EPREFIX}/usr" \
diff --git a/sci-chemistry/coot/files/9999-libpng-1.5.patch b/sci-chemistry/coot/files/9999-libpng-1.5.patch
new file mode 100644
index 000000000..bddd25169
--- /dev/null
+++ b/sci-chemistry/coot/files/9999-libpng-1.5.patch
@@ -0,0 +1,29 @@
+--- ccp4mg-utils/ppmutil.cc
++++ ccp4mg-utils/ppmutil.cc
+@@ -2494,15 +2494,21 @@
+ 
+   pixels = new unsigned char[width*height*colourspace];
+ 
++  png_colorp palette;
++  int num_trans;
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >=4
++  png_bytep trans_alpha;
++#endif
++
+   for (int i=0; i<height; i++){
+     if(color_type==PNG_COLOR_TYPE_PALETTE){
+       for (int j=0; j<width; j++){
+-        pixels[i*width*colourspace+j*colourspace] = png_ptr->palette[row_pointers[i][j]].red;
+-        pixels[i*width*colourspace+j*colourspace+1] = png_ptr->palette[row_pointers[i][j]].green;
+-        pixels[i*width*colourspace+j*colourspace+2] = png_ptr->palette[row_pointers[i][j]].blue;
+-        if(row_pointers[i][j]<png_ptr->num_trans){
++        pixels[i*width*colourspace+j*colourspace] = palette[row_pointers[i][j]].red;
++        pixels[i*width*colourspace+j*colourspace+1] = palette[row_pointers[i][j]].green;
++        pixels[i*width*colourspace+j*colourspace+2] = palette[row_pointers[i][j]].blue;
++        if(row_pointers[i][j]<num_trans){
+ #if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >=4
+-         pixels[i*width*colourspace+j*colourspace+3] = png_ptr->trans_alpha[row_pointers[i][j]];
++         pixels[i*width*colourspace+j*colourspace+3] = trans_alpha[row_pointers[i][j]];
+ #else
+          pixels[i*width*colourspace+j*colourspace+3] = png_ptr->trans[row_pointers[i][j]];
+ #endif