Bumped to EAPI=3, princepily prefix ready, adopt to current python situation, fix #308691

Package-Manager: portage-2.2_rc66/cvs/Linux i686

4 files changed, 163 insertions, 7 deletions

diff --git a/sci-chemistry/viewmol/ChangeLog b/sci-chemistry/viewmol/ChangeLog
index 0af651ea57e8..7dabc128900e 100644
--- a/sci-chemistry/viewmol/ChangeLog
+++ b/sci-chemistry/viewmol/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/viewmol
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/viewmol/ChangeLog,v 1.8 2008/06/27 10:32:55 ulm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/viewmol/ChangeLog,v 1.9 2010/03/10 17:09:14 jlec Exp $
+
+*viewmol-2.4.1-r1 (10 Mar 2010)
+
+  10 Mar 2010; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  +files/2.4.1-change-default-paths.patch, +viewmol-2.4.1-r1.ebuild:
+  Bumped to EAPI=3, princepily prefix ready, adopt to current python
+  situation, fix #308691
 
   27 Jun 2008; Ulrich Mueller <ulm@gentoo.org> viewmol-2.4.1.ebuild:
   Change dependency from virtual/motif to x11-libs/openmotif, bug 224749.
diff --git a/sci-chemistry/viewmol/Manifest b/sci-chemistry/viewmol/Manifest
index bf054dca3c58..4ab620a08692 100644
--- a/sci-chemistry/viewmol/Manifest
+++ b/sci-chemistry/viewmol/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA1
 
 AUX 2.4.1-change-default-path-to-usr.patch 311 RMD160 4b953f0f9a8a18a18847cb0aa7ea8a6af25e8236 SHA1 2d0603b9638edf5d41699c322867eabbf50d19a5 SHA256 b6530fe1cb5d3a410c7ba15f1fa618377c4fa14dec04b8778ff0de3ca73faa22
+AUX 2.4.1-change-default-paths.patch 2773 RMD160 9736f1c3ee8f603435b3f2c2f0f620ac1381746d SHA1 d42dbde43ccdfc3bf12f16c37dd12b222e1db50d SHA256 5348896392d5b1ca2f318013792f6791bda11d51b572afa93c78f0491266ab4e
 AUX 2.4.1-look-for-python-in-right-place.patch 866 RMD160 cc62c43ef5a9a84b389b3afa960ae25f7774b55b SHA1 80f4478111625e98e2623fa698aa0d9c7086cd1a SHA256 0e92b32387c093f6619495bf92bac45a87bb183aa0f30a1080992c86ebe62d0d
 AUX 2.4.1-remove-icc-check.patch 1214 RMD160 b6e1f7fe33b5d21f9fcffb5da63563b8f7236cdd SHA1 4748df9fe707ad8b200de2a705e0ddab814a3b6e SHA256 4c0f638a44ee74093103a8f3b9e94252b31c0eff875596aade43eb7c2faf06c7
 AUX 2.4.1-use-root-for-app-defaults.patch 827 RMD160 109cf436c73bb732f89c16f206892b2297a20ee7 SHA1 17ce44db692b61c635719f32bc90d8a36f95bb06 SHA256 c7e82343c254a38e61fee72e5e86ecd86339e56e783255a5d882bcff38937094
 DIST viewmol-2.4.1.src.tgz 2229379 RMD160 d63d1a6aa2ab9212874cf9bae82a238a440aba47 SHA1 8e6c55bd1381db076706e19df44fc8e7d3a6b9aa SHA256 dfed3eed6441d89c4bf2be1c13cbe263341c8880edf1742d446fc0f8f4a99e19
+EBUILD viewmol-2.4.1-r1.ebuild 2197 RMD160 7002f9d7c7dc229b3129efd262c7da695d6c4517 SHA1 2fdf80d3dff1e791b4ad904206704a730a045dc0 SHA256 a2d1208a3359274f6e0acdc68361ac4036eeeb9d14f0c92cb455dcccf8bde469
 EBUILD viewmol-2.4.1.ebuild 1165 RMD160 6486f2783a4440b18eab7586e62f0bfd6cdd9c05 SHA1 a4d921c5d55ec7f2214a20260665678833d52161 SHA256 bce2939af022e984137a39f28b170ee0674e377dd4ec65aa7b65dfcbcfb91ca3
-MISC ChangeLog 1484 RMD160 cb0b10665b42e2b77cf8a1982e43c493dbfe72a7 SHA1 15100ca1244ffa402d4d4b3fbbd229ecc3604638 SHA256 7eefef45c5dce4efc609a134a53277fe2dfadaa22ae11c8ee33c521c67fef6ec
+MISC ChangeLog 1739 RMD160 4368f6bab3ad99b2c9646e453b8015c072132720 SHA1 b06f8e88b92477a3ecbb141ac81992bdd9509858 SHA256 e0a845fb48f06b6747fc08da4efb6dfb5616d71c553df6cc6902992252b0060b
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkhkwgYACgkQOeoy/oIi7uzWiwCg1TKGoyGSkgUEpnh2X3j/iGyI
-vn8An1b2WNFIDU/GqTQTpSlYbYrWVwsh
-=2YuN
+iEYEARECAAYFAkuX0kAACgkQgAnW8HDreRYD1wCfV8ufpwh1tyOMgvcqzByxOaXi
+KIwAni8KggP67Tr6SSVpx57sGDFv223m
+=gh72
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/viewmol/files/2.4.1-change-default-paths.patch b/sci-chemistry/viewmol/files/2.4.1-change-default-paths.patch
new file mode 100644
index 000000000000..16a3d7ef7e38
--- /dev/null
+++ b/sci-chemistry/viewmol/files/2.4.1-change-default-paths.patch
@@ -0,0 +1,68 @@
+diff --git a/source/getrc.c b/source/getrc.c
+index a39b436..c130096 100644
+--- a/source/getrc.c
++++ b/source/getrc.c
+@@ -87,7 +87,7 @@ extern XtAppContext app;
+ 
+ static char viewmolpath[MAXLENLINE];
+ 
+-#define DEFAULTPATH "/usr/local/lib/viewmol"
++#define DEFAULTPATH "@GENTOO_PORTAGE_EPREFIX@/usr/GENTOOLIBDIR/viewmol"
+ 
+ int getrc(void)
+ {
+diff --git a/source/install b/source/install
+index 580865b..f136af3 100755
+--- a/source/install
++++ b/source/install
+@@ -54,24 +54,27 @@ fi
+ cp $dirorig/viewmol $ROOT/bin
+ chmod 711 $ROOT/bin/viewmol
+ 
+-# install other files needed in $ROOT/lib/viewmol
+-if [ ! -d $ROOT/lib/viewmol/$dir ]
++# install other files needed in $ROOT/GENTOOLIBDIR/viewmol
++if [ ! -d $ROOT/GENTOOLIBDIR/viewmol/$dir ]
+ then
+-  mkdir -p $ROOT/lib/viewmol/$dir
+-  chmod 755 $ROOT/lib/viewmol/$dir
++  mkdir -p $ROOT/GENTOOLIBDIR/viewmol/$dir
++  chmod 755 $ROOT/GENTOOLIBDIR/viewmol/$dir
+ fi
+ cd $dirorig
+-cp tm bio readgamess readgauss readmopac readpdb $ROOT/lib/viewmol/$dir
+-chmod 711 $ROOT/lib/viewmol/$dir/*
++cp tm bio readgamess readgauss readmopac readpdb $ROOT/GENTOOLIBDIR/viewmol/$dir
++chmod 711 $ROOT/GENTOOLIBDIR/viewmol/$dir/*
+ cd ../..
+-cp readdmol readdmol.awk readgulp readpqs writecar writegauss.py writemol writetm $ROOT/lib/viewmol
+-chmod 755 $ROOT/lib/viewmol/*
+-cp -r doc examples locale scripts tests $ROOT/lib/viewmol
+-find $ROOT/lib/viewmol -type f -exec chmod a+r {} \;
+-find $ROOT/lib/viewmol -type d -exec chmod a+rx {} \;
+-sed 's/\/source//g' viewmolrc > $ROOT/lib/viewmol/viewmolrc
+-chmod -R 644 $ROOT/lib/viewmol/viewmolrc
+-if [ -d /usr/X11R6/lib/X11/app-defaults ]
++cp readdmol readdmol.awk readgulp readpqs writecar writegauss.py writemol writetm $ROOT/GENTOOLIBDIR/viewmol
++chmod 755 $ROOT/GENTOOLIBDIR/viewmol/*
++mkdir -p $ROOT/usr/share/viewmol $ROOT/usr/share/doc/GENTOODOCDIR/ $ROOT/GENTOOLIBDIR/viewmol/
++cp -r examples scripts tests $ROOT/usr/share/viewmol
++cp -r locale $ROOT/GENTOOLIBDIR/viewmol/
++cp -r doc/* examples scripts tests $ROOT/usr/share/doc/GENTOODOCDIR/
++find $ROOT/GENTOOLIBDIR/viewmol -type f -exec chmod a+r {} \;
++find $ROOT/GENTOOLIBDIR/viewmol -type d -exec chmod a+rx {} \;
++sed 's/\/source//g' viewmolrc > $ROOT/GENTOOLIBDIR/viewmol/viewmolrc
++chmod -R 644 $ROOT/GENTOOLIBDIR/viewmol/viewmolrc
++if [ -d $ROOT/X11R6/GENTOOLIBDIR/X11/app-defaults ]
+ then
+   locale=`echo $LANG | cut -c1-2`
+   if [ "$locale" = "en" ]
+@@ -82,6 +85,6 @@ then
+     # The C locale is defined by default for rpm builds, overwrite it
+     locale="en_US"
+   fi
+-  cp locale/${locale}/Viewmol /usr/X11R6/lib/X11/app-defaults
+-  chmod a+r /usr/X11R6/lib/X11/app-defaults/Viewmol
++  cp locale/${locale}/Viewmol ${ROOT}/X11R6/GENTOOLIBDIR/X11/app-defaults
++  chmod a+r ${ROOT}/X11R6/GENTOOLIBDIR/X11/app-defaults/Viewmol
+ fi
diff --git a/sci-chemistry/viewmol/viewmol-2.4.1-r1.ebuild b/sci-chemistry/viewmol/viewmol-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..4e2eb952023e
--- /dev/null
+++ b/sci-chemistry/viewmol/viewmol-2.4.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/viewmol/viewmol-2.4.1-r1.ebuild,v 1.1 2010/03/10 17:09:14 jlec Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="tk"
+
+inherit eutils multilib prefix python toolchain-funcs
+
+DESCRIPTION="Open-source graphical front end for computational chemistry programs"
+HOMEPAGE="http://viewmol.sourceforge.net/"
+SRC_URI="mirror://sourceforge/viewmol/${P}.src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libpng
+	media-libs/tiff
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/openmotif"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xproto"
+
+S="${WORKDIR}/${P}/source"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-remove-icc-check.patch
+	epatch "${FILESDIR}"/${PV}-change-default-paths.patch
+
+	eprefixify getrc.c
+	sed "s:GENTOOLIBDIR:$(get_libdir):g" \
+		-i install getrc.c || die
+	sed "s:GENTOODOCDIR:${PF}:g" -i install || die
+
+	LINKFORSHARED=$($(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LINKFORSHARED')")
+
+	mkdir $(uname -s) && cd $(uname -s)
+
+	cat >> .config.$(uname -s) <<- EOF
+	LIBTIFF = -L${EPREFIX}/usr/$(get_libdir)
+	TIFFINCLUDE = ${EPREFIX}/usr/include
+	LIBPNG = -L${EPREFIX}/usr/$(get_libdir)
+	PNGINCLUDE = ${EPREFIX}/usr/include
+	PYTHONVERSION = $(PYTHON)
+	PYTHONINCLUDE = ${EPREFIX}/$(python_get_includedir)
+	PYTHONLIB = ${EPREFIX}/usr/$(get_libdir)
+	COMPILER = $(tc-getCC)
+	CFLAGS = ${CFLAGS} -DLINUX
+	LDFLAGS = ${LDFLAGS} ${LINKFORSHARED}
+	SCANDIR=
+	INCLUDE=\$(TIFFINCLUDE) -I\$(PNGINCLUDE) -I\$(PYTHONINCLUDE)
+	LIBRARY=\$(LIBTIFF) \$(LIBPNG) -L\$(LIBPYTHON)
+	LIBS=-L${EPREFIX}/$(get_libdir) -l\${PYTHONVERSION} -ltiff -lpng -lz -lGLU -lGL -L${EPREFIX}/usr/X11R6/lib -lXm -lXmu -lXp -lXi -lXext -lXt -lX11 -lpthread -lutil -ldl -lm
+	EOF
+
+	cp .config.$(uname -s) makefile
+	cat ../Makefile >> makefile
+}
+
+src_compile() {
+	pushd $(uname -s)
+	emake viewmol_ tm_ bio_ readgamess_ readgauss_ readmopac_ readpdb_ || die
+	popd
+	${ERPEFIX}/bin/bash makeTranslations || die
+}
+
+src_install() {
+	./install ${ED}/usr || die
+}