Moved the installation of profile files from sci-chemistry/ccp4-apps to sci-libs/ccp4-libs, #349700

Package-Manager: portage-2.2.0_alpha14/cvs/Linux x86_64

3 files changed, 109 insertions, 19 deletions

diff --git a/sci-libs/ccp4-libs/ChangeLog b/sci-libs/ccp4-libs/ChangeLog
index ac6df1b0e17c..81d7587974c9 100644
--- a/sci-libs/ccp4-libs/ChangeLog
+++ b/sci-libs/ccp4-libs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/ccp4-libs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.20 2011/01/02 00:01:06 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.21 2011/01/10 21:16:01 jlec Exp $
+
+*ccp4-libs-6.1.3-r7 (10 Jan 2011)
+
+  10 Jan 2011; Justin Lecher <jlec@gentoo.org> -ccp4-libs-6.1.3-r4.ebuild,
+  +ccp4-libs-6.1.3-r7.ebuild:
+  Moved the installation of profile files from sci-chemistry/ccp4-apps to
+  sci-libs/ccp4-libs, #349700
 
   02 Jan 2011; Thomas Kahle <tomka@gentoo.org> ccp4-libs-6.1.3-r5.ebuild:
   x86 stable per bug 350233
diff --git a/sci-libs/ccp4-libs/Manifest b/sci-libs/ccp4-libs/Manifest
index 5b81b0dc9c92..8ce5274ef6d9 100644
--- a/sci-libs/ccp4-libs/Manifest
+++ b/sci-libs/ccp4-libs/Manifest
@@ -11,14 +11,14 @@ AUX 6.1.3-noinstall.patch 5188 RMD160 d3b22f11d7c27b37243b003f03615af377c8e632 S
 AUX 6.1.3-overflows.patch 904 RMD160 03d5f10e901734c6e21be3e68592711450df32cd SHA1 24a740658fae2f917061c2a032a43a60e75c5478 SHA256 e5c62922daf832b62e9ea1e14a2be0d54c88b035b78b5831eee07025dff9222a
 AUX 6.1.3-unbundle-libs.patch 9063 RMD160 326af0e6990134546fb2607dae707b94d4588149 SHA1 ef929532e45c12fb168e5fca4eb7fa8c857c376a SHA256 7e5fc919b5204e2d9141f7715afdd8a8b4e3e2a96e2bf95aa00fbd56046f1aa4
 DIST ccp4-6.1.3-core-src.tar.gz 242134076 RMD160 e9b7deb0766fb95d5e8946881f20e086f0896fe9 SHA1 ee5ada892694db5dc9b2d7d2330b4ac694f56580 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324
-EBUILD ccp4-libs-6.1.3-r4.ebuild 6529 RMD160 e8bda41b9ab3d70671b3480ffadbc351932c2ea9 SHA1 9d41287629cccaa15d8ef2fd55b053bafe527178 SHA256 dcb414487da51508646bb63c87187eef19739258cae01704e7b8bc9b568b574e
 EBUILD ccp4-libs-6.1.3-r5.ebuild 6735 RMD160 4c4e471799ae22091cb091011410afe05bb92261 SHA1 bd67d482656f2cbb0af005c3c4a02c48aa270e1f SHA256 7e16439607d588f533e4dde13cee62083e021f41beb7895b0fbfec9f68517959
-MISC ChangeLog 3211 RMD160 8c652590c4127ec41c6fb10b76e5c0a0762d7d64 SHA1 e9510348f5e8e0b1f944f6b609a6ddb0ad236b91 SHA256 9dda64f168ffcec893f094515360ab66dffaf7f497489600a46a8bf3589047c9
+EBUILD ccp4-libs-6.1.3-r7.ebuild 10496 RMD160 599a460ba927c489373f1fd8ec0f92c9f514542e SHA1 81c60263fbcb2be70d696d61e0d382e8e63ffbd9 SHA256 949fd2bbef711cc60a0e66f4fdd2468bf7f929dbdae742a79e5289d24705af15
+MISC ChangeLog 3455 RMD160 52e2758b9ba63d957714ab0ecb18e62de77638b5 SHA1 03888e86d1e2e3aaa14acfda2499763afd4ace43 SHA256 7adb50d1ea8aa6b4729972403e86d1b6107ad88a16fc8b7d4334675e38deaf6c
 MISC metadata.xml 306 RMD160 57ba72f54388a666851bda87e52d313d618084e3 SHA1 7d2f57cb3f35eb6d4567b211e01251b5945d4eb2 SHA256 af351be5ead71b377b6fa2fa118fb9aee74129afdc19f736b41596d3033106aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0fwEoACgkQnZsgo/h8kNY43gCfYjFTLZWaL7mw/YDSSWgcMbRv
-TLwAoKEKxzrnFe6KHCkvcHrBNMLOVA3H
-=+XDW
+iEYEARECAAYFAk0rdxYACgkQgAnW8HDreRatuACgzE/p4RCj/oI6wqbQdsyFRqQh
+p4cAmwT/sXieaXCgNK7huwAP5BcfzvAw
+=5kwG
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r4.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r7.ebuild
index 44478303fc9b..79712a4f1d78 100644
--- a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r4.ebuild
+++ b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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-r4.ebuild,v 1.6 2010/12/31 17:07:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r7.ebuild,v 1.1 2011/01/10 21:16:01 jlec Exp $
 
 EAPI="3"
 
@@ -41,15 +41,16 @@ done
 
 LICENSE="ccp4"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
 	virtual/jpeg
 	app-shells/tcsh
 	!<sci-chemistry/ccp4-6.1.3
+	!<sci-chemistry/ccp4-apps-${PVR}
 	sci-libs/cbflib
-	=sci-libs/fftw-2*
+	sci-libs/fftw:2.1
 	sci-libs/mmdb
 	sci-libs/monomer-db
 	virtual/lapack
@@ -149,12 +150,15 @@ src_configure() {
 
 	# Fix up variables -- need to reset CCP4_MASTER at install-time
 	sed -i \
-		-e "s~^\(setenv CCP4_MASTER.*\)/.*~\1"${WORKDIR}"~g" \
+		-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*
 
 	# Set up variables for build
-	source "${S}"/include/ccp4.setup
+	source "${S}"/include/ccp4.setup-sh
 
 	export CC=$(tc-getCC)
 	export CXX=$(tc-getCXX)
@@ -163,7 +167,6 @@ src_configure() {
 	# Default to -O2 if FFLAGS is unset
 	export FC=$(tc-getFC)
 	export FOPTIM=${FFLAGS:- -O2}
-#	export CCP4_SCR="${T}"
 
 	# Fix linking
 #	$(tc-getCC) ${userldflags} -shared -Wl,-soname,libmmdb.so -o libmmdb.so \${MMDBOBJS} $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lm -lstdc++ && \
@@ -175,13 +178,13 @@ src_configure() {
 	./configure \
 		--onlylibs \
 		--with-shared-libs \
-		--with-fftw="${EPREFIX}"/usr \
+		--with-fftw="${EPREFIX}/usr" \
 		--with-warnings \
 		--disable-cctbx \
 		--disable-clipper \
 		--tmpdir="${TMPDIR}" \
-		--bindir="${EPREFIX}"/usr/libexec/ccp4/bin/ \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--bindir="${EPREFIX}/usr/libexec/ccp4/bin/" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		${GENTOO_OSNAME} || die "econf failed"
 }
 
@@ -192,14 +195,73 @@ src_compile() {
 
 src_install() {
 	# Set up variables for build
-	source "${S}"/include/ccp4.setup
+	source "${S}"/include/ccp4.setup-sh
 
 	emake -j1 \
 		DESTDIR="${D}" \
-		includedir="${EPREFIX}"/usr/include \
-		library_includedir="${EPREFIX}"/usr/include \
+		includedir="${EPREFIX}/usr/include" \
+		library_includedir="${EPREFIX}/usr/include" \
 		install || die
 
+	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_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 CLIBS=\).*:\1${EPREFIX}/usr/$(get_libdir):g" \
+		-e "s:^\(.*setenv CLIBS \).*:\1${EPREFIX}/usr/$(get_libdir):g" \
+		-e "s:^\(.*export CLIB=\).*:\1${EPREFIX}/usr/$(get_libdir):g" \
+		-e "s:^\(.*setenv CLIB \).*:\1${EPREFIX}/usr/$(get_libdir):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 "/CCP4_HELPDIR/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
@@ -212,6 +274,16 @@ src_install() {
 		fi
 	done
 
+	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 || die
+	newins "${S}"/include/ccp4.setup-sh 40ccp4.setup.sh || die
+	rm -f "${S}"/include/ccp4.setup*
+
 	# Fix libdir in all *.la files
 	sed -i \
 		-e "s:^\(libdir=\).*:\1\'${EPREFIX}/usr/$(get_libdir)\':g" \
@@ -220,10 +292,21 @@ src_install() {
 	# Data
 	insinto /usr/share/ccp4/data/
 	doins -r "${S}"/lib/data/{*.PARM,*.prt,*.lib,*.dic,*.idl,*.cif,*.resource,*.york,*.hist,fraglib,reference_structures} || die
+
+	# Environment files, setup scripts, etc.
+	rm -rf "${S}"/include/{ccp4.setup*,COPYING,cpp_c_headers} || die
+	insinto /usr/share/ccp4/
+	doins -r "${S}"/include || die
+
 	dodoc "${S}"/lib/data/*.doc || die
 	newdoc "${S}"/lib/data/README DATA-README || die
 }
 
+pkg_postinst() {
+	einfo "The Web browser defaults to firefox. Change CCP4_BROWSER"
+	einfo "in ${EPREFIX}/etc/profile.d/ccp4.setup* to modify this."
+}
+
 # Epatch wrapper for bulk patching
 ccp_patch() {
 	EPATCH_SINGLE_MSG="  ${1##*/} ..." epatch ${1}