Install docs into correct path, #315399; Link as-needed conform; build docs only with USE=doc, #248348

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 145 insertions, 5 deletions

diff --git a/sci-chemistry/moldy/ChangeLog b/sci-chemistry/moldy/ChangeLog
index 7425667bedd3..9502d5eac6a8 100644
--- a/sci-chemistry/moldy/ChangeLog
+++ b/sci-chemistry/moldy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/moldy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/moldy/ChangeLog,v 1.17 2010/02/17 21:22:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/moldy/ChangeLog,v 1.18 2010/04/15 14:46:26 jlec Exp $
+
+*moldy-2.16e-r2 (15 Apr 2010)
+
+  15 Apr 2010; Justin Lecher <jlec@gentoo.org> +files/2.16e-as-needed.patch,
+  +moldy-2.16e-r2.ebuild:
+  Install docs into correct path, #315399; Link as-needed conform; build
+  docs only with USE=doc, #248348
 
 *moldy-2.16e-r1 (17 Feb 2010)
 
diff --git a/sci-chemistry/moldy/Manifest b/sci-chemistry/moldy/Manifest
index 7f8fc63ad581..315d6c8cc259 100644
--- a/sci-chemistry/moldy/Manifest
+++ b/sci-chemistry/moldy/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 2.16e-as-needed.patch 3226 RMD160 c048174a30d035b8faed813c329910fc7803aeae SHA1 bdf474a62f1a5d0f4ed33306581ee4d7b96b06ff SHA256 304343516efed00901c996a8948705047a7fa46a4b5c26243ded0bf73118e98b
 DIST moldy-2.16e.tar.gz 488410 RMD160 ef9c1c6cf1afa6e28e78a51a6a771d127aac2c83 SHA1 e7984f59170a11b5dab0beae89c5f4cf4da20ad1 SHA256 51abefc5e7de355022f48084382c30e72738cc1f21cd3d67fde7f047f1822ea8
 EBUILD moldy-2.16e-r1.ebuild 1709 RMD160 b4646bfb62d0e0a3c2e4e1985820c950777ecef0 SHA1 362dc075ace00bbbbe98948fbf7033198da2ad07 SHA256 5609f452e274f886ab3997efffb7c1587db3078121cc5c7499d37e4237b50fb6
+EBUILD moldy-2.16e-r2.ebuild 1871 RMD160 04e56583f54d9a737ce6845c95a5e14724aa8bc0 SHA1 4a51aecf1091cbda3b6e0ba004b7b1eb76905815 SHA256 23ef07376a63f69b7cd0fd1a91d7f575f1865f026bb22f8b05c1819884f4a111
 EBUILD moldy-2.16e.ebuild 1641 RMD160 08dc8ed5a5d703f49db1885320ef4feb91fe8cf5 SHA1 f043c7d0d1bff0d953b480856fee667671eeb157 SHA256 57bf10c99b2a50311996017943c2c09e09edcd0c76ea578c57c1544ad6f6278d
-MISC ChangeLog 3066 RMD160 8a118aee4f4f4165d25d0f8583e29eac3c00dcd3 SHA1 d7f030f3ec72110aa494967eb2f786305664732d SHA256 e30db706fd7f004fb45cb9a96cac9f842d4e10b2bc96da10f3efb1914eacbc8c
+MISC ChangeLog 3308 RMD160 c0cfe1fa293d10bd014f6ab55e2ddfcec5d5b818 SHA1 73c1e2c2c199df683173ede7212c3051b823ba1e SHA256 3668e6bbcede7aefe2c94e46d5ef2ea9b3e81347c3fd0f535a3e4a951aa92ebe
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkt8XhMACgkQgAnW8HDreRYR/QCgneHu7Nsi3d/lk+uAU9L0Mnc2
-r94An2Vq5JNLMfiz4W50W4e+EIQig7zl
-=n6AZ
+iEYEARECAAYFAkvHJs0ACgkQgAnW8HDreRZPYwCfWvg1tvCxjAk70+ysArkFF4FZ
++oAAn1pxLgmI8QAnsh1tRMgj0DUe4DxH
+=IfF2
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/moldy/files/2.16e-as-needed.patch b/sci-chemistry/moldy/files/2.16e-as-needed.patch
new file mode 100644
index 000000000000..67399e08560e
--- /dev/null
+++ b/sci-chemistry/moldy/files/2.16e-as-needed.patch
@@ -0,0 +1,65 @@
+diff --git a/Makefile.in b/Makefile.in
+index 0b02f00..ec588a8 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -115,25 +115,25 @@ VMSBUILD=	compile_moldy.com link_moldy.com defcomm.com\
+ 
+ DOSBUILD=	Makefile.mak OFILES.RSP SHAKOBJS.RSP Makefile.w32
+ 
+-all:		moldy utilities Makefile
++all:		moldy utilities
+ 
+ moldy:		$(OFILES) $(EXTRA_OBJ) $(HFILES)
+-		$(CC) -o moldy $(LDFLAGS) $(OFILES) $(EXTRA_OBJ)  $(LIBS)
++		$(CC) $(LDFLAGS) -o moldy $(LDFLAGS) $(OFILES) $(EXTRA_OBJ)  $(LIBS)
+ 
+ moldyext:	moldyext.c $(LIBOBJS) $(HFILES)
+-		$(CC) $(CFLAGS) -o moldyext $(OPT) $(DEFS) $(LDFLAGS1) moldyext.c $(LIBOBJS) $(LDFLAGS) $(LIBS)
++		$(CC) $(LDFLAGS) $(CFLAGS) -o moldyext $(OPT) $(DEFS) $(LDFLAGS1) moldyext.c $(LIBOBJS) $(LIBS)
+ 
+ manalyze:	manalyze.c $(HFILES)
+-		$(CC) $(CFLAGS)  -o manalyze $(OPT) $(DEFS) $(LDFLAGS1) manalyze.c $(LDFLAGS) $(LIBS)
++		$(CC) $(LDFLAGS) $(CFLAGS)  -o manalyze $(OPT) $(DEFS) $(LDFLAGS1) manalyze.c $(LIBS)
+ 
+ dumpanal:	dumpanal.c xdr.o $(HFILES)
+-		$(CC) $(CFLAGS) -o dumpanal $(OPT) $(DEFS) $(LDFLAGS1) dumpanal.c xdr.o  $(LDFLAGS) $(LIBS)
++		$(CC) $(LDFLAGS) $(CFLAGS) -o dumpanal $(OPT) $(DEFS) $(LDFLAGS1) dumpanal.c xdr.o $(LIBS)
+ 
+ dumpext:	dumpext.c xdr.o utlsup.o matrix.o $(LIBOBJS) $(HFILES)
+-		$(CC) $(CFLAGS) -o dumpext $(OPT) $(DEFS) $(LDFLAGS1) dumpext.c xdr.o utlsup.o matrix.o $(LIBOBJS) $(LDFLAGS) $(LIBS)
++		$(CC) $(LDFLAGS) $(CFLAGS) -o dumpext $(OPT) $(DEFS) $(LDFLAGS1) dumpext.c xdr.o utlsup.o matrix.o $(LIBOBJS) $(LIBS)
+ 
+ dumpconv:	dumpconv.c xdr.o $(HFILES)
+-		$(CC) $(CFLAGS) -o dumpconv $(OPT) $(DEFS) $(LDFLAGS1) dumpconv.c xdr.o $(LDFLAGS) $(LIBS)
++		$(CC) $(LDFLAGS) $(CFLAGS) -o dumpconv $(OPT) $(DEFS) $(LDFLAGS1) dumpconv.c xdr.o $(LIBS)
+ 
+ #mdtraj:		mdtraj.o $(SHAKOBJS) $(LIBOBJS) 
+ #		$(CC) -o mdtraj $(LDFLAGS) mdtraj.o $(SHAKOBJS) $(LIBOBJS) $(LIBS)
+@@ -142,21 +142,21 @@ mdshak:		mdshak.o $(SHAKOBJS) $(LIBOBJS)
+ 		$(CC) -o mdshak $(LDFLAGS) mdshak.o $(SHAKOBJS) $(LIBOBJS) $(LIBS)
+ 
+ msd:		msd.o $(SHAKOBJS) $(LIBOBJS) 
+-		$(CC) -o msd $(LDFLAGS1) msd.o $(SHAKOBJS) $(LIBOBJS) $(LDFLAGS) $(LIBS)
++		$(CC) $(LDFLAGS) -o msd $(LDFLAGS1) msd.o $(SHAKOBJS) $(LIBOBJS) $(LIBS)
+ 
+ mdvaf:		mdvaf.o $(SHAKOBJS) $(LIBOBJS) 
+-		$(CC) -o mdvaf $(LDFLAGS1) mdvaf.o $(SHAKOBJS) $(LIBOBJS) $(LDFLAGS) $(LIBS)
++		$(CC) $(LDFLAGS) -o mdvaf $(LDFLAGS1) mdvaf.o $(SHAKOBJS) $(LIBOBJS) $(LIBS)
+ mdavpos:	mdavpos.o $(SHAKOBJS) $(LIBOBJS) 
+-		$(CC) -o mdavpos $(LDFLAGS1) mdavpos.o $(SHAKOBJS) $(LIBOBJS) $(LDFLAGS)  $(LIBS)
++		$(CC) $(LDFLAGS) -o mdavpos $(LDFLAGS1) mdavpos.o $(SHAKOBJS) $(LIBOBJS) $(LIBS)
+ 
+ mdbond:	mdbond.o $(SHAKOBJS) $(LIBOBJS) 
+-		$(CC) -o mdbond $(LDFLAGS1) mdbond.o $(SHAKOBJS) $(LIBOBJS) $(LDFLAGS)  $(LIBS)
++		$(CC) $(LDFLAGS) -o mdbond $(LDFLAGS1) mdbond.o $(SHAKOBJS) $(LIBOBJS) $(LIBS)
+ 
+ bdist:	bdist.c $(HFILES)
+-		$(CC) $(CFLAGS)  -o bdist $(OPT) $(DEFS) $(LDFLAGS1) bdist.c $(LIBOBJS) $(LDFLAGS) $(LIBS)
++		$(CC) $(CFLAGS) $(LDFLAGS) -o bdist $(OPT) $(DEFS) $(LDFLAGS1) bdist.c $(LIBOBJS) $(LIBS)
+ 
+ ransub:	ransub.o $(SHAKOBJS) $(LIBOBJS) 
+-		$(CC) -o ransub $(LDFLAGS1) ransub.o $(SHAKOBJS) $(LIBOBJS) $(LDFLAGS)  $(LIBS)
++		$(CC) $(LDFLAGS) -o ransub $(LDFLAGS1) ransub.o $(SHAKOBJS) $(LIBOBJS) $(LIBS)
+ 
+ utilities:	$(UTILS) $(UTILS2)
+ 
diff --git a/sci-chemistry/moldy/moldy-2.16e-r2.ebuild b/sci-chemistry/moldy/moldy-2.16e-r2.ebuild
new file mode 100644
index 000000000000..4dec449079b4
--- /dev/null
+++ b/sci-chemistry/moldy/moldy-2.16e-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/moldy/moldy-2.16e-r2.ebuild,v 1.1 2010/04/15 14:46:26 jlec Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Program for performing molecular dynamics simulations."
+HOMEPAGE="http://www.ccp5.ac.uk/moldy/moldy.html"
+SRC_URI="ftp://ftp.earth.ox.ac.uk/pub/keith/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~x86-linux ~ppc-macos"
+IUSE="doc examples"
+
+DEPEND="doc? ( virtual/latex-base )"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-as-needed.patch
+}
+
+src_configure() {
+	#Individuals may want to edit the OPT* variables below.
+	#From the READ.ME:
+	#You may need to  "hand-tune" compiler or optimization options,
+	#which may be specified by setting the OPT and OPT2 environment
+	#variables.  OPT2 is used to compile only the most performance-critical
+	#modules and usually will select a very high level of optimization.
+	#It should be safe to select an optimization which means "treat all
+	#function arguments as restricted pointers which are not aliased to
+	#any other object".  OPT is used for less preformance-critical modules
+	#and may be set to a lower level of optimization than OPT2.
+
+	OPT="${CFLAGS}" \
+	OPT2="${CFLAGS} ${CFLAGS_OPT}" \
+	CC=$(tc-getCC) \
+	econf
+}
+
+src_compile() {
+	emake || die
+	# To prevent sandbox violations by metafont
+	if use doc; then
+		VARTEXFONTS="${T}"/fonts emake moldy.pdf || die
+	fi
+}
+
+src_install() {
+	dodir /usr/bin
+	emake prefix="${ED}"/usr install || die
+	dodoc BENCHMARK READ.ME RELNOTES || die
+
+	if use examples; then
+		rm Makefile.in configure.in config.h.in
+		insinto /usr/share/${PN}/examples/
+		doins *.in *.out control.* || die
+	fi
+	if use doc; then
+		insinto /usr/share/doc/${PF}/pdf
+		newins moldy.pdf moldy-manual.pdf
+	fi
+}