Force error on build failure, bug #543028; fix for format-security
authorJustin Lecher <jlec@gentoo.org>
Mon, 16 Mar 2015 13:44:12 +0000 (13:44 +0000)
committerJustin Lecher <jlec@gentoo.org>
Mon, 16 Mar 2015 13:44:12 +0000 (13:44 +0000)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

sci-libs/ccp4-libs/ChangeLog
sci-libs/ccp4-libs/Manifest
sci-libs/ccp4-libs/ccp4-libs-6.1.3-r16.ebuild [new file with mode: 0644]
sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-force.patch [new file with mode: 0644]
sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-format-security.patch [new file with mode: 0644]

index a74f14f97eda5b2c79734c0297b82155f0471151..dcac016bae87b8d50ca622e4dfdd9eb52f6a12aa 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/ccp4-libs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.62 2015/03/12 10:07:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.63 2015/03/16 13:44:11 jlec Exp $
+
+*ccp4-libs-6.1.3-r16 (16 Mar 2015)
+
+  16 Mar 2015; Justin Lecher <jlec@gentoo.org> +ccp4-libs-6.1.3-r16.ebuild,
+  +files/ccp4-libs-6.1.3-force.patch,
+  +files/ccp4-libs-6.1.3-format-security.patch:
+  Force error on build failure, bug #543028; fix for format-security
 
   12 Mar 2015; Agostino Sarubbo <ago@gentoo.org> ccp4-libs-6.1.3-r15.ebuild:
   Stable for amd64, wrt bug #542696
index 65ea3f7027703291017e822277a834b354791d9a..bdc5a395109b8795c455a20d95ce98249a3bee41 100644 (file)
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 6.0.2-ppc-double-define-gerror.patch 424 SHA256 09c2c1e0176bee94673b21609b2b00118b2bb4f5942f3feb35c64c61c99ebc61 SHA512 3080aa9ce3fad2d972b5f2622b2f0119ad8c4306f84de6dfcb24c8ef17ebd9a163bf8e807d34508d999b8e205abec9d18daddeb3e5f8fdef075d888301ba4ed9 WHIRLPOOL 55dc0176c7aa84b5b4ab1e6ad397d358f794d0f42737efef2e4048a67cd2060c90652ecb356e3a2847091e0e5d5429c80fd1ce7c5a5348a6693d6065d18969fd
 AUX 6.1.3-cbf.patch 773 SHA256 767a2286956471c6dbf0feee9a5726f5170af21cb2dd85c7f45190cab5cce7a0 SHA512 ecf950cf82fc0c16e4e3f64b06f92a03c283dd04c2fc68932546ad863240fef49d44906a739d49d6913ceac5c8e0672ec3a7dfd2bb973f3c8ed5481c33464823 WHIRLPOOL 1307e0df9243f6cf867cefd18c7b22d4d880711f45ddf56729bedc2703584f7a42328fe87c00be7cf8d418bbd74db957128f3b527e283a384ed956bc0e5691b7
@@ -16,25 +16,30 @@ AUX 6.1.3-overflows.patch 904 SHA256 e5c62922daf832b62e9ea1e14a2be0d54c88b035b78
 AUX 6.1.3-unbundle-libs-ng.patch 13925 SHA256 e24757ac37a173fc501f1036e283f048faf7705b28cb8345492c4a8683a37e90 SHA512 b2f1e23ce2b1e5c8efd9b53a8c2f844c6ea472582f5ed79fc43ac00347f207eb56ce3dc080f57b15d80cfe6a7d1cd7ff01b0c8b8e72bc7f403acadb3566bb5c4 WHIRLPOOL 58273fade76919bc14181025cc35ff790e1b2734c4e753dc76336be9424dfb0666c3ea76f588e1ab91fb23f5fbf6eb131d0a0fe39c2f1d16fbdfac0879c0967d
 AUX 6.1.3-unbundle-libs-ng2.patch 15485 SHA256 ded20e7e5a3fd347bc852ca119b3cbe6cde22c8acae21d710d69da4ab12fa7a6 SHA512 4ba517c14a298a31cf894c26dafc713c1b3b5acc114c653874f914bf3d197fa2fec82305775357e343d809e8d240f5f2b0c6573859ecf2b89a7aa17e1f1c7554 WHIRLPOOL 52dbd8044f563d2ba2f4c8cef615067fd6fb9034b5e6fd543a0dc3830ced99b47347cb5bd57f5a246e744f67609883e800057b552831f75d6b4553726f7b764a
 AUX 6.1.3-unbundle-libs.patch 9063 SHA256 7e5fc919b5204e2d9141f7715afdd8a8b4e3e2a96e2bf95aa00fbd56046f1aa4 SHA512 3e4b2564e3870f024a95bbf556ad597c0de7f83309aaa0f3d3af80c05b616eb0cbec04abe94546951c316b172accb74580c74a16963e3213c5477c89d4fae85d WHIRLPOOL 64d9c5408a48b80a515e465d0ce59ffad3b61e6f9ab247cfd23ac17af40e723d387a7970d116ce8d4aae45a051ae5901de0e96ccbf21a6df84cc341c03a6224e
+AUX ccp4-libs-6.1.3-force.patch 448 SHA256 36e31119c685097ed2ba98220e7813dc5d8265cd6fd36d2c202cc87e6a1fc2de SHA512 1045f711ce04f60ae53018c424673eb0b759daef18888b584ff3db106f1fb883f2a902f93a76427ba860e0ded8204db62e36ced23f05f03967e4eefa72a3561c WHIRLPOOL 72b63f206825e7d2cb4aa0a7c1ac783df71b0b695be0eb16a300c88c01080593da61e83f12003cd2c3d10b71b5c12f6a4b3b0d9867ae53a1bc7fe0fa7a88a98c
+AUX ccp4-libs-6.1.3-format-security.patch 626 SHA256 19085719bf567a1f81cbc014773d1185dc3d1698eab463aa5048ad8e78d68eae SHA512 5ae84afa6f3af77abb4bb85ca92a548d61279ec816cef3e1972a268bfe0fd4f3e1d36fa437cb291b45922efd902c87b9a0575bc72e99b437e23d0d5d4c7d44b7 WHIRLPOOL f24b17170bbbde9660881cf348e5f284a38e77c0b7a27eeec9e42c68af5d7f8f5faf8ff590e94959f3c2a7cda93e65d57ebe57449bea1082e975186e41f5aeaf
 DIST ccp4-6.1.3-core-src.tar.gz 242134076 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324 SHA512 413eba806107ebcdbd93e9122275463709133d9b2a9ce44ae57a6c2350465a47ba66ad9875237aead74f5d422c0104f58f728ab37a757b10d82cde92af444c20 WHIRLPOOL faebf8ee7920013bc3d0e83565207dca1f31ba0b5c92fe1eae4b740f70ff2031d95787fa0d545b09c853d25657c08973527e43de02fddc086988123ca2a6339c
 EBUILD ccp4-libs-6.1.3-r11.ebuild 10942 SHA256 5fbe4cf4b9056be38670f8dfa6ee4ff15a02ebd1651e92d393eeda8fa91de754 SHA512 bc163a58ceb913cbfe6854d6d0eaa24b4f0ae23b81fc7c72f88cfde6a2a3cc84d042da9b134c774a0d6d9545fe182e9db5883f5dc355e1a39623132587269f7b WHIRLPOOL 99f59454db2636e4aaae0d013b570578eae5e7830be00e724a3ee3e64e24158909f749925c7ed19d358c7a5d9bb1877affd6f4272f37ad6c7aecb573cc68b6fb
 EBUILD ccp4-libs-6.1.3-r15.ebuild 11175 SHA256 fd702758aec48941c0658f40b4ec0740aea96e41048f22726ba65874d5f80bb6 SHA512 1186e73681e52e575d2fcf072c536c26dfa3b6a082470075d059c3488efc81eea652d79341e708949157be9863edbf1974a73c75238a07cfc4bb9acc50580199 WHIRLPOOL 725bc0e008e5b3f15e643ee07176b939033301a79b29e141c6ec9cc8eeab405f646b4f6b69f0315ef50d18fca635de414771da98a408fcca5b7e6fc7425de646
-MISC ChangeLog 9415 SHA256 28408ec4c3ff8af1fbfb784358a4eff5e648857df03bfff736fc6556fa0b29fa SHA512 d88d89ac903c6620cb8a0d5ed314f3145bd8a36a03db820f8d9cc79660fd9c377ee257de72ceb451007e5f57f33cbd6e8d34d180a5f51faec0034088aaa63142 WHIRLPOOL 9b284d4f1270265e1b35ee77301d83d4cfc18248cbcf7a10e546f0708098c8548780d4b6d10d5f745eb928c740d7d764cbf14bd8567b304a11dc0e25c1f38463
+EBUILD ccp4-libs-6.1.3-r16.ebuild 11322 SHA256 7cec4339f653ce4b0a1c6ac9fa2d8be4b39b43e0ac9400355c98c3cd4c6eb5cc SHA512 f550ff86a0f30fedeeece8226a997868d767dd4d12a130e7a8ede64ab3589f9443166da4be09fc243dc62c7d1dd10d1b30e1967aa5424d489efb8c8ce210e00e WHIRLPOOL f0b5967c467522b2c509d9ecb6443620ec5c15566424a4c1a25f6a6617446768232647b900284bf0071bc750cf2e16a8655854f88ecfec22c5253a8665bc4f08
+MISC ChangeLog 9684 SHA256 79d330d2931880f969a9973b4916775214ec18cb3334e2cdd5aa7367ab72d86a SHA512 78cfd056536fce839ff2d7e97043edc3e430a6c8fe2a0bf15714c37d7b837b69dfd7b0776515980623d3b25c3d4121d896db8d723e1a5b39e0f16fc572cef4f0 WHIRLPOOL 1a4bfed48f325d442bbb6e47265d33e52dc7eae2039f103e88ed22290f5f29b0545a18dc739542ad34050fe967397004b73e99da5baf88cfb7253cd35c3cd7d8
 MISC metadata.xml 272 SHA256 464cdfad7e5470cd4897f4d81fb87220dfdb9b8645f720e2fcf5157a7a75fbec SHA512 3e8682fbb209895927a39021555e3a440c49e61dcce93ea1b13759e067b285c604328cff031843e3aac6528970384c8fdbf15c8edd76a421db111a3981825fa5 WHIRLPOOL fc8d5f3db9db73bb2026ca21c4448107558ac53d568c89c7c6ccc635fde460aec1bbd177a4ad770b20d35693b59fc0721c8d60aea997973db3efd6b3c3777eba
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVAWV9AAoJELp701BxlEWfE48QAJedfvn1WJ7Tu6c8bu8UFvyq
-Cl0BcrqWyWmd6kOXdriXNA3jG26CV5k5wjUuNUK7WJ0SEXS417un+z3EELykcTLl
-by6mwxhaGUTR9W2NEF+PC9YKq5zsOeH7HgcsH2oChZRrNhHgXGKK4XmB8c7N3GC5
-j+5dvIda6pfroSJIEKbzJ2Qew4y/EbrUFuGl+/7IhBaJUVwHfw1oegQPsLH6KwEi
-0B4xJFdLZ9+argbEJh+XtPdBsj6wTraCEc5C7E3zi/M63sCN2QHq3L7O12BL6KOO
-9aleNbILzWuzNNKq4N2HhWnsk0HgvFmUNgthC+0ZWLi153STi5+AVlNP6ZRJ+DaQ
-3UR863FChguRY7llQfsAQi6CV4UdN3en/Z3ssCOYAXBHViCvTomTH9/fPGKi2eHJ
-VKacLTxpp6BCZeuCQoDBoEjqcADlSbwRdWcfFO/Gn8/n6UhbW75S/JPHR6pa/8eJ
-SAWXJsAR11BJbIqwZpvHD1JdxR+XMjHUOD1gKGtLxcX58UnZ4fOdbtXxm/50jAR+
-IDiw1p+LZFkEEQdRj5g3Czv9/k3sT8X1rnxHc+jQOGf7TitSmHn1X32gUIQ0CwX0
-5gLwf3E/gllVAZOAV9R1BG6Lrolh8YerKj5IppRKYTkcP4DIPhbPT3F4bXuKl5Lz
-ZJENp0loO2hln6OutQpq
-=MCHP
+iQJ8BAEBCgBmBQJVBt4sXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirlucP/iRF9VLUktQKdNZeXhhFHa4D
+j3PNU8cUvMg/77U3PJgMtPdEiBFIfSUkt5JdB7nlUG9U+NVyK+m+HXEYipU/+R5o
+bV04MmWSU72Lpj1Gd7jefmT5ooga298BDphx351fmHNBqLRseC2eOCQBgo5zNBls
+xO1T9jCkJLwU9qnup74xhzD+Mu3yp4scvOSC47prqCzj7TR/rdi/5oSdupwn2y4j
+1qjhdq2VOY7glEcyjLCkKgpocHtUPJ4lqIw8YcK9pfyfxDAr6AJXQ49bTUhaipqx
+HLSTqIU1qk8BpvGfAW++h6hOz53jFHAeM7CAwdalFVTyJmSCReSkAJdwrK/2y9ZK
+vF9bPAgeR6lNfnhVAHw4JRM01riAoDIQIzFlxT9ABg//sK75ZeucEyzmxZsvo3Kq
+FSzvCuXadhcZOZsiC87YXLhcFppMti/Ac1XZVH1VQepJcYAXcXz+/AWLaPB2jLQc
+cpPYG0CQodxJmWgTk1TWurEGNNYLu55kF6iZUhOZdq9qUITSvGUyrWru6bxSwSY6
+4yS4TVfCN3On0SfZ/1jH4EM+GZlWb5YrlC6dbEvMlAtBYMPJAkgBtHHZqLHlXH1W
+NZlO4iBOdxzEgcO2t0cnFGNrdNvBgA68trgSuYe0QSdnj2V5K+8FvMBwt/RpQ+iV
+iWhiLe/E2L3CT7HXLkjq
+=+YBH
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r16.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r16.ebuild
new file mode 100644 (file)
index 0000000..bed27d1
--- /dev/null
@@ -0,0 +1,356 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r16.ebuild,v 1.1 2015/03/16 13:44:11 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils fortran-2 gnuconfig multilib python-single-r1 toolchain-funcs
+
+SRC="ftp://ftp.ccp4.ac.uk/ccp4"
+
+#UPDATE="04_03_09"
+#PATCHDATE="090511"
+
+MY_P="${P/-libs}"
+
+PATCH_TOT="0"
+
+DESCRIPTION="Protein X-ray crystallography toolkit - Libraries"
+HOMEPAGE="http://www.ccp4.ac.uk/"
+SRC_URI="${SRC}/${PV}/${MY_P}-core-src.tar.gz"
+# patch tarball from upstream
+       [[ -n ${UPDATE} ]] && SRC_URI="${SRC_URI} ${SRC}/${PV}/updates/${P}-src-patch-${UPDATE}.tar.gz"
+# patches created by us
+       [[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} http://dev.gentoo.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
+
+for i in $(seq $PATCH_TOT); do
+       NAME="PATCH${i}[1]"
+       SRC_URI="${SRC_URI}
+               ${SRC}/${PV}/patches/${!NAME}"
+done
+
+LICENSE="ccp4"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+       ${PYTHON_DEPS}
+       !<sci-chemistry/ccp4-6.1.3
+       !<sci-chemistry/ccp4-apps-${PV}-r10
+       app-shells/tcsh
+       dev-lang/tcl
+       >=sci-libs/cbflib-0.9.2.2
+       sci-libs/fftw:2.1
+       sci-libs/mmdb:0
+       sci-libs/monomer-db
+       sci-libs/ssm
+       virtual/jpeg:0=
+       virtual/lapack
+       virtual/blas"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+       fortran-2_pkg_setup
+       python-single-r1_pkg_setup
+}
+
+src_prepare() {
+       tc-export PKG_CONFIG RANLIB AR
+
+       sed \
+               -e "/^AR/s:ar:$(tc-getAR):g" \
+               -i lib/src/Makefile.in src/Makefile.in src/ccp4mapwish_/Makefile.in lib/ccif/Makefile.in || die
+
+       einfo "Applying upstream patches ..."
+       for patch in $(seq $PATCH_TOT); do
+               base="PATCH${patch}"
+               dir=$(eval echo \${${base}[0]})
+               p=$(eval echo \${${base}[1]})
+               pushd "${dir}" >& /dev/null
+               ccp_patch "${DISTDIR}/${p}"
+               popd >& /dev/null
+       done
+       einfo "Done."
+       echo
+
+       [[ -n ${PATCHDATE} ]] && epatch "${WORKDIR}"/${PV}-${PATCHDATE}-updates.patch
+
+       einfo "Applying Gentoo patches ..."
+       # fix buffer overflows wrt bug 339706
+       ccp_patch "${FILESDIR}"/${PV}-overflows.patch
+
+       # it tries to create libdir, bindir etc on live system in configure
+       ccp_patch "${FILESDIR}"/${PV}-dont-make-dirs-in-configure.patch
+
+       # gerror_ gets defined twice on ppc if you're using gfortran/g95
+       ccp_patch "${FILESDIR}"/6.0.2-ppc-double-define-gerror.patch
+
+       # make creation of libccif.so smooth
+       ccp_patch "${FILESDIR}"/${PV}-ccif-shared.patch
+
+       # lets try to build libmmdb seperatly
+       ccp_patch "${FILESDIR}"/${PV}-dont-build-mmdb.patch
+
+       # unbundle libjpeg and cbflib
+       ccp_patch "${FILESDIR}"/${PV}-unbundle-libs-ng2.patch
+
+       # Fix missing DESTIDR
+       # not installing during build
+       ccp_patch "${FILESDIR}"/${PV}-noinstall.patch
+       sed \
+               -e '/SHARE_INST/s:$(libdir):$(DESTDIR)/$(libdir):g' \
+               -i configure || die
+
+       # Fix upstreams code
+       ccp_patch "${FILESDIR}"/${PV}-impl-dec.patch
+
+       # use pkg-config to detect BLAS/LAPACK
+       ccp_patch "${FILESDIR}"/${PV}-lapack.patch
+
+       # proto type changing in version 0.9.2.2
+       ccp_patch "${FILESDIR}"/${PV}-cbf.patch
+
+       # proto type changing in version 0.9.2.2
+       ccp_patch "${FILESDIR}"/${PV}-no-pypath.patch
+
+       ccp_patch "${FILESDIR}"/${P}-force.patch
+
+       ccp_patch "${FILESDIR}"/${P}-format-security.patch
+
+       einfo "Done." # done applying Gentoo patches
+       echo
+
+       # not needed, we have it extra
+       rm -rf src/rapper/{libxml2,gc7.0} || die
+
+       sed \
+               -e "s:/usr:${EPREFIX}/usr:g" \
+               -e 's:-Wl,-rpath,$CLIB::g' \
+               -e 's: -rpath $CLIB::g' \
+               -e 's: -I${srcdir}/include/cpp_c_headers::g' \
+               -e 's:sleep 1:sleep .2:g' \
+               -i configure || die
+
+       gnuconfig_update
+
+       for i in lib/DiffractionImage src/rapper src/pisa; do
+               pushd ${i} > /dev/null
+                       sed 's:-g::g' -i configure* || die
+                       [[ -f configure.in ]] && mv configure.{in,ac}
+                       eautoreconf
+               popd > /dev/null
+       done
+
+       ## unbundle libssm
+       sed -e '/libdir/s:ssm::g' -i Makefile.in || die
+       find ./lib/src/mmdb ./lib/ssm ./lib/clipper ./lib/fftw lib/lapack -delete || die
+}
+
+src_configure() {
+       rm -rf lib/DiffractionImage/{jpg,CBFlib} || die
+
+       # Build system is broken if we set LDFLAGS
+       userldflags="${LDFLAGS}"
+       export SHARED_LIB_FLAGS="${LDFLAGS}"
+       unset LDFLAGS
+
+       # GENTOO_OSNAME can be one of:
+       # irix irix64 sunos sunos64 aix hpux osf1 linux freebsd
+       # linux_compaq_compilers linux_intel_compilers generic Darwin
+       # ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers
+       if [[ "$(tc-getFC)" = "ifort" ]]; then
+               if use ia64; then
+                       GENTOO_OSNAME="ia64_linux_intel"
+               else
+                       # Should be valid for x86, maybe amd64
+                       GENTOO_OSNAME="linux_intel_compilers"
+               fi
+       else
+               # Should be valid for x86 and amd64, at least
+               GENTOO_OSNAME="linux"
+       fi
+
+       # Sets up env
+       ln -s \
+               ccp4.setup-bash \
+               "${S}"/include/ccp4.setup || die
+
+       # We agree to the license by emerging this, set in LICENSE
+       sed -i \
+               -e "s~^\(^agreed=\).*~\1yes~g" \
+               "${S}"/configure || die
+
+       # Fix up variables -- need to reset CCP4_MASTER at install-time
+       sed -i \
+               -e "s~^\(setenv CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \
+               -e "s~^\(export CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \
+               -e "s~^\(.*export CBIN=.*\)\$CCP4.*~\1\$CCP4/libexec/ccp4/bin/~g" \
+               -e "s~^\(.*setenv CBIN .*\)\$CCP4.*~\1\$CCP4/libexec/ccp4/bin/~g" \
+               -e "s~^\(setenv CCP4I_TCLTK.*\)/usr/local/bin~\1${EPREFIX}/usr/bin~g" \
+               "${S}"/include/ccp4.setup* || die
+
+       # Set up variables for build
+       source "${S}"/include/ccp4.setup-sh
+
+       export CC=$(tc-getCC)
+       export CXX=$(tc-getCXX)
+       export COPTIM=${CFLAGS}
+       export CXXOPTIM=${CXXFLAGS}
+       # Default to -O2 if FFLAGS is unset
+       export FC=$(tc-getFC)
+       export FOPTIM=${FFLAGS:- -O2}
+
+       export SHARE_LIB="\
+               $(tc-getCC) ${userldflags} -shared -Wl,-soname,libccp4c.so -o libccp4c.so \${CORELIBOBJS} \${CGENERALOBJS} \${CUCOBJS} \${CMTZOBJS} \${CMAPOBJS} \${CSYMOBJS} -L../ccif/ -lccif $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lm && \
+               $(tc-getFC) ${userldflags} -shared -Wl,-soname,libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -L../ccif/ -lccif -L. -lccp4c $($(tc-getPKG_CONFIG) --libs mmdb) $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lstdc++ -lgfortran -lm"
+
+       # Can't use econf, configure rejects unknown options like --prefix
+       ./configure \
+               --onlylibs \
+               --with-shared-libs \
+               --with-fftw="${EPREFIX}/usr" \
+               --with-warnings \
+               --disable-cctbx \
+               --disable-clipper \
+               --disable-ssm \
+               --tmpdir="${TMPDIR}" \
+               --bindir="${EPREFIX}/usr/libexec/ccp4/bin/" \
+               --libdir="${EPREFIX}/usr/$(get_libdir)" \
+               ${GENTOO_OSNAME} || die "configure failed"
+}
+
+src_compile() {
+       emake DESTDIR="${D}" onlylib
+}
+
+src_install() {
+       # Set up variables for build
+       source "${S}"/include/ccp4.setup-sh
+
+       emake \
+               DESTDIR="${D}" \
+               includedir="${EPREFIX}/usr/include" \
+               library_includedir="${EPREFIX}/usr/include" \
+               install
+
+       sed \
+               -e "330,1000d" \
+               -i "${S}"/include/ccp4.setup-sh || die
+
+       sed \
+               -e "378,1000d" \
+               -i "${S}"/include/ccp4.setup-csh || die
+
+       sed \
+               -e "s:-${PV/-r*/}::g" \
+               -e "s:^\(.*export CCP4_MASTER=\).*:\1${EPREFIX}/usr:g" \
+               -e "s:^\(.*setenv CCP4_MASTER\).*:\1 ${EPREFIX}/usr:g" \
+               -e "s:^\(.*export CCP4=\).*CCP4_MASTER.*:\1${EPREFIX}/usr:g" \
+               -e "s:^\(.*setenv CCP4\).*CCP4_MASTER.*:\1 ${EPREFIX}/usr:g" \
+               -e "s:^\(.*export CCP4_SCR=\).*:\1${EPREFIX}/tmp:g" \
+               -e "s:^\(.*setenv CCP4_SCR \).*:\1${EPREFIX}/tmp:g" \
+               -e "s:^\(.*export BINSORT_SCR=\).*:\1${EPREFIX}/tmp:g" \
+               -e "s:^\(.*setenv BINSORT_SCR \).*:\1${EPREFIX}/tmp:g" \
+               -e "s:^\(.*export CCP4I_TOP=\).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i:g" \
+               -e "s:^\(.*setenv CCP4I_TOP \).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i:g" \
+               -e "s:^\(.*export CCP4I_TCLTK=\).*:\1${EPREFIX}/usr/bin:g" \
+               -e "s:^\(.*setenv CCP4I_TCLTK \).*:\1${EPREFIX}/usr/bin:g" \
+               -e "s:^\(.*export CCP4I_HELP=\).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i/help:g" \
+               -e "s:^\(.*setenv CCP4I_HELP \).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i/help:g" \
+               -e "s:^\(.*export CBIN=\).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
+               -e "s:^\(.*setenv CBIN \).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
+               -e "s:^\(.*export CCP4_BIN=\).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
+               -e "s:^\(.*setenv CCP4_BIN \).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
+               -e "s:^\(.*export CLIBD_MON=\).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
+               -e "s:^\(.*setenv CLIBD_MON \).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
+               -e "s:^\(.*export CLIBD=\).*:\1${EPREFIX}/usr/share/ccp4/data:g" \
+               -e "s:^\(.*setenv CLIBD \).*:\1${EPREFIX}/usr/share/ccp4/data:g" \
+               -e "s:^\(.*export CCP4_LIB=\).*:\1${EPREFIX}/usr/$(get_libdir):g" \
+               -e "s:^\(.*setenv CCP4_LIB \).*:\1${EPREFIX}/usr/$(get_libdir):g" \
+               -e "s:^\(.*export CCP4_BROWSER=\).*:\1firefox:g" \
+               -e "s:^\(.*setenv CCP4_BROWSER \).*:\1firefox:g" \
+               -e "s:^\(.*export MANPATH=\).*:\1\${MANPATH}:g" \
+               -e "s:^\(.*setenv MANPATH \).*:\1\${MANPATH}:g" \
+               -e "s:^\(.*export DBCCP4I_TOP=\).*:\1${EPREFIX}/usr/share/ccp4/dbccp4i:g" \
+               -e "s:^\(.*setenv DBCCP4I_TOP \).*:\1${EPREFIX}/usr/share/ccp4/dbccp4i:g" \
+               -e "s:^\(.*export MOLREPLIB=\).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
+               -e "s:^\(.*setenv MOLREPLIB \).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
+               -e "s:^\(.*export CDOC=\).*:\1${EPREFIX}/usr/share/doc:g" \
+               -e "s:^\(.*setenv CDOC \).*:\1${EPREFIX}/usr/share/doc:g" \
+               -e "s:^\(.*export CEXAM=\).*:\1${EPREFIX}/usr/share/doc/examples:g" \
+               -e "s:^\(.*setenv CEXAM \).*:\1${EPREFIX}/usr/share/doc/examples:g" \
+               -e "s:^\(.*export CINCL=\).*:\1${EPREFIX}/usr/share/ccp4/include:g" \
+               -e "s:^\(.*setenv CINCL \).*:\1${EPREFIX}/usr/share/ccp4/include:g" \
+               -e "s:\$CLIB/font84.dat:\"${EPREFIX}/usr/$(get_libdir)/font84.dat\":g" \
+               -e "s:\$CLIB/cif_mmdic.lib:\"${EPREFIX}/usr/$(get_libdir)/cif_mmdic.lib\":g" \
+               -e '/# .*LD_LIBRARY_PATH specifies/,/^$/d' \
+               -e '/CLIB=/d' \
+               -e '/CLIB /d' \
+               -e '/CLIBS=/d' \
+               -e '/CLIBS /d' \
+               -e "/alias/d" \
+               -e "/CCP4_HELPDIR/d" \
+               -e "/IMOSFLM_VERSION/d" \
+               -i "${S}"/include/ccp4.setup* || die
+
+       # Don't check for updates on every sourcing of /etc/profile
+       sed -i \
+               -e "s:\(eval python.*\):#\1:g" \
+               "${S}"/include/ccp4.setup* || die
+
+       # Libs
+       for file in "${S}"/lib/*; do
+               if [[ -d ${file} ]]; then
+                       continue
+               elif [[ -x ${file} ]]; then
+                       dolib.so ${file}
+               else
+                       insinto /usr/$(get_libdir)
+                       doins ${file}
+               fi
+       done
+
+       prune_libtool_files
+
+       sed \
+               -e 's:test "LD_LIBRARY_PATH":test "$LD_LIBRARY_PATH":g' \
+               -i "${S}"/include/ccp4.setup-sh || die
+
+       # Setup scripts
+       insinto /etc/profile.d
+       newins "${S}"/include/ccp4.setup-csh 40ccp4.setup.csh
+       newins "${S}"/include/ccp4.setup-sh 40ccp4.setup.sh
+       rm -f "${S}"/include/ccp4.setup*
+
+       # Data
+       insinto /usr/share/ccp4/data/
+       doins -r "${S}"/lib/data/{*.PARM,*.prt,*.lib,*.dic,*.idl,*.cif,*.resource,*.york,*.hist,fraglib,reference_structures}
+
+       # Environment files, setup scripts, etc.
+       rm -rf "${S}"/include/{ccp4.setup*,COPYING,cpp_c_headers} || die
+       insinto /usr/share/ccp4/
+       doins -r "${S}"/include
+
+       dodoc "${S}"/lib/data/*.doc
+       newdoc "${S}"/lib/data/README DATA-README
+}
+
+pkg_postinst() {
+       einfo "The Web browser defaults to firefox. Change CCP4_BROWSER"
+       einfo "in ${EPREFIX}/etc/profile.d/40ccp4.setup* to modify this."
+}
+
+# Epatch wrapper for bulk patching
+ccp_patch() {
+       EPATCH_SINGLE_MSG="  ${1##*/} ..." epatch ${1}
+}
diff --git a/sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-force.patch b/sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-force.patch
new file mode 100644 (file)
index 0000000..367d53e
--- /dev/null
@@ -0,0 +1,16 @@
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 60033eb..13ddbd0 100755
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -53,7 +53,7 @@ clipper: FORCE fftw
+ 
+ diffractionImg: 
+       if test -n "$(diffimdir)"; then cd $(top_srcdir)/$(diffimdir); \
+-      $(MAKE) -i $(MFLAGS) $(MVARS); else true; fi
++      $(MAKE) $(MFLAGS) $(MVARS); fi
+ 
+ ssm: 
+       if test -n "$(ssmdir)"; then cd $(top_srcdir)/$(ssmdir); \
diff --git a/sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-format-security.patch b/sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-format-security.patch
new file mode 100644 (file)
index 0000000..caf62bb
--- /dev/null
@@ -0,0 +1,16 @@
+ lib/DiffractionImage/DiffractionImagePythonInterface.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/DiffractionImage/DiffractionImagePythonInterface.cpp b/lib/DiffractionImage/DiffractionImagePythonInterface.cpp
+index f729fc5..4c24e82 100755
+--- a/lib/DiffractionImage/DiffractionImagePythonInterface.cpp
++++ b/lib/DiffractionImage/DiffractionImagePythonInterface.cpp
+@@ -867,7 +867,7 @@ SWIG_Python_AddErrorMsg(const char* mesg)
+     Py_DECREF(old_str);
+     Py_DECREF(value);
+   } else {
+-    PyErr_Format(PyExc_RuntimeError, mesg);
++    PyErr_Format(PyExc_RuntimeError, "%s", mesg);
+   }
+ }
+