sci-chemistry/avogadro: add another missing fPIC, #446548; thanks Oldrich Jedlicka and Todd Goodman for the patch

Package-Manager: portage-2.2.0_alpha162/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 39 insertions, 10 deletions

diff --git a/sci-chemistry/avogadro/ChangeLog b/sci-chemistry/avogadro/ChangeLog
index 6a96b00971bb..ba1a04e1e9ca 100644
--- a/sci-chemistry/avogadro/ChangeLog
+++ b/sci-chemistry/avogadro/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/avogadro
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.42 2013/02/08 12:25:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.43 2013/02/13 18:35:25 jlec Exp $
+
+  13 Feb 2013; Justin Lecher <jlec@gentoo.org>
+  files/avogadro-1.1.0-textrel.patch, metadata.xml:
+  add another missing fPIC, #446548; thanks Oldrich Jedlicka and Todd Goodman
+  for the patch
 
   08 Feb 2013; Agostino Sarubbo <ago@gentoo.org> avogadro-1.0.3-r1.ebuild:
   Add ~ppc, wrt bug #455960
diff --git a/sci-chemistry/avogadro/Manifest b/sci-chemistry/avogadro/Manifest
index e81a48068c27..6107099ac671 100644
--- a/sci-chemistry/avogadro/Manifest
+++ b/sci-chemistry/avogadro/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 1.0.1-gl2ps.patch 1511 SHA256 0aae5556233c8e413739fdd890b5d8453d9a1e39dd3251a5a7a7705227a13e7b SHA512 b4a8d0138bffa7c018e2125e16a47cefefba01f19ce3d460488f36e44f55b212cea9c9875429e7c0c596388366adea045b50ace579b6352d2b7e0b073420c67f WHIRLPOOL 015420a79e56b5f3da238d73d12e28573636161e4edcdc94db80149aa84621de05b84f08332d701b5ed89dadb414a30e33badc686788698dd539603d2eeb5a05
-AUX avogadro-1.1.0-textrel.patch 756 SHA256 433bc2dcad2809d1b2fd81e846a47481e6d75cb0361b9709efbcc376082ee224 SHA512 8b86fe2032eabf63eb8a284bf6add1d3388c39b5755bd483eac8da0ef5dc2087d043b4e3ad7a61feab37b840e5a004b16dc68086252f2bc0ddfae9cab9d85bf5 WHIRLPOOL 25e0df3b1dc7e02e7778dd66111fd76185548a2cfd358c13f38a54edc3041022cf263083b8e4b83cfb9bd5a493d205d11827dea1fb010d2657de3c847d980cfc
+AUX avogadro-1.1.0-textrel.patch 1515 SHA256 51e10ec964dfc5e1dabda95aa189e7b408e76a0e8dcbd5ca2c34b0fe368d9f74 SHA512 605733d5164b65b6043dc13d1dc53d045f204a90992e3f4adcf8bdd743a4f1a351724b0f4de24f095ed38ffb3a288810c18b21eef98ecb7be0d44333dd28ab9c WHIRLPOOL 5e783e0facd32bbfd31354790efe3644130148e049e14be6243975de1760381771aac8de02bb8b1d74a8e0aca8df403798275d0ba1d59a5b3f561d66f8159b0d
 DIST avogadro-1.0.3.tar.bz2 4971989 SHA256 efb6fda223da3c027436f0c218a47ce804f7469c58b41134230e9ebad1c98468 SHA512 49e7b8ca43f0f52a65efc7bf9dc45670ae5a5de5d1aa6bf7b58b8368e816be30fe6529c45fa658d7337d4a69327bb0aa8799d8d4b4805860aace28011cc74210 WHIRLPOOL c835ac24b317a1fa310bf3ea75bae4002d01f364d4754e6a7d841594dcce321435c827d60e125d9410f05670a94c887cc250bf49759d02cde34a5839d2324c92
 DIST avogadro-1.1.0.tar.bz2 10741835 SHA256 6b4eaf57ae52bf43df9b103c77e6abae71e067053d5c99f82acbce9855ecceb0 SHA512 d621dd3ea9e9223d3a29c6b0c0eec89a935837d0c587fcaaa549f91274a76f78a8c60c2a68a67d2f3aa2e107826befb6658be601c46c5bc0760c95bf7284540a WHIRLPOOL c81e866e60b3383a58de515317c754e3982e716c27974ce43ca0c1209d24544949361a7f2f93a4a940d73fd7a18b184f68c7a1856fea89ae5eba75db74b1012d
 EBUILD avogadro-1.0.3-r1.ebuild 1297 SHA256 eb544a274ca4ae85660a1547975478ccea8eed90840693bc1f7049142f276211 SHA512 58212c2ef70b658a9bd8887852995268355017dcd81c5bc73747d75f61e48a921860f48cc3cfe2445298ca45ee3959b62a367aeea28d51df9dac61d5bf6aca8f WHIRLPOOL 4da577d8ee70e451a2392493ecf0c7cc5fb773cd7f5a6e2b570579c1496e66c9d5308e2849516d05ba4ca136ed2e0767027b83cecc76c448bc93df5cfab55fe5
 EBUILD avogadro-1.1.0.ebuild 1435 SHA256 f02780acdc2ddac4cc7a71d3a70ee0301f0f6750cd885c5adec8e1a0b25de8ee SHA512 0df7521c6d938c4085a8f381e58125a738770b60a17772a96e807f17c491b75ee36ebb4ac0f53d7e42b5c7b7f84ed53f2506555ae93416074d21228809f71f33 WHIRLPOOL 52536e06c9c3b9836d7958da9f6c7f3a5a08c9b7a2669ea12f9ff0036353f792382e08d3e75dae55d585457bad32b8224e524a0058bd03850918f1d386c5207e
-MISC ChangeLog 6672 SHA256 e1d111cb228168bb33b4b279f58a1ba24d13521847c613dee2584ec81ed342df SHA512 2b583a99c7febb25a15a88b205c429c2545644fbac00fa8eb204f1e2373f5ee448d68f42e85e499a8fcc12e973ac5bb6536e04c3bbdc8cfde974da05ffcfa327 WHIRLPOOL a6da9c75602b7b7a7fac07af31a5c8a86bce34608f1922a43a6d6833184cf71844f211f2f1fd0049b0ba9c35b2dd03751756778546d28b2c8ee9a9146d028464
-MISC metadata.xml 527 SHA256 d67a0e6d35b2446449ca6937f60adb2e33a204da8dec20f0fa847659348ddc15 SHA512 bb879b77ad6eed881822bee0f262ef3a5fe1b0b63584fe159b0c86501e227b86a32e50f36e79942cda05ef552f91ed0bec2eced8a5a67fbeb1265e979098a0f0 WHIRLPOOL 399f0d4a344ce90420154d1468315a93f388141c8a2e655a69e9a9aa2870cc67bd25dee6ada8e35b0725f43e82d79dad462351db1132c52c04f96204ece1bc2a
+MISC ChangeLog 6867 SHA256 048c7974ec87846dcbe3858e8c7e04dc6f9abfb753ffde722c6c51140d15bf15 SHA512 5677d29e954e1dfc97a76d5bf0fd909c37a2db9541bbef543d3fda6aa4170808bf166f9c1dc2b810560bce3de8e59fdb570dd12d07c243e13b9bce95038444bc WHIRLPOOL 615e76a226be538e705d2ea569425f1efcb7f7077cfb2e5702abc3fc94c2933ba10c204e5e57b8a1586e04b12e3130738e1d956262c8c6feababec2cf5789bee
+MISC metadata.xml 533 SHA256 f0c611c081821a1a7e7ba42af53fc9bb4318119da01ae593c6fb96d866c31c8a SHA512 f1b061fa7a00034b9fd99a571c1371168fda35a746fdd8bd4008e6ce467d4d1ea1e9279621e5cc3ac749f43ca9e73a16ac9cc6cff48a3d5a181efde74da50a19 WHIRLPOOL 3b30945b5b2eddab07f5270257b1de35287d2e3e9d605ace285cc7d1f7473059b31b757c163329c53bda80a6d47d5faf0b240218767eca503fb22ad79a362d2b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREKAAYFAlEb3RAACgkQgAnW8HDreRa5pQCeP7tSONbybWDVRd9NivpAH/UF
+FokAoJIGOk8gMcoRESjRgOS12VQHfstA
+=ROlR
+-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.0-textrel.patch b/sci-chemistry/avogadro/files/avogadro-1.1.0-textrel.patch
index 5b5cf0e4dc17..2a9b2e14a2a8 100644
--- a/sci-chemistry/avogadro/files/avogadro-1.1.0-textrel.patch
+++ b/sci-chemistry/avogadro/files/avogadro-1.1.0-textrel.patch
@@ -1,5 +1,6 @@
  libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt b/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt
 index fb88316..2ddcfdf 100644
@@ -13,3 +14,16 @@ index fb88316..2ddcfdf 100644
 +if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^(i.86|x86|x86_64)$")
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC"  )
  endif()
+diff --git a/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt b/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt
+index 0cd0c3e..9e89daf 100644
+--- a/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt
++++ b/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt
+@@ -19,7 +19,7 @@ add_library(tubegen STATIC ${tubegen_SRCS})
+ set_target_properties(tubegen PROPERTIES COMPILE_FLAGS "-w")
+ 
+ # Set -fPIC on x86_64
+-if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
++if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^(i.86|x86|x86_64)$")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC"  )
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC"  )
+ endif()
diff --git a/sci-chemistry/avogadro/metadata.xml b/sci-chemistry/avogadro/metadata.xml
index c478c239e306..b0721418598d 100644
--- a/sci-chemistry/avogadro/metadata.xml
+++ b/sci-chemistry/avogadro/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
-	<longdescription>
+  <herd>sci-chemistry</herd>
+  <longdescription>
     Avogadro is an advanced molecular editor designed for cross-platform use in
 	computational chemistry, molecular modeling, bioinformatics, materials
 	science, and related areas. It offers flexible rendering and a powerful
 	plugin architecture.
   </longdescription>
-	<use>
-		<flag name="glsl">Enable glsl features via GLEW.</flag>
-	</use>
+  <use>
+    <flag name="glsl">Enable glsl features via GLEW.</flag>
+  </use>
 </pkgmetadata>