From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- sci-chemistry/viewmol/Manifest | 5 -- .../viewmol/files/2.4.1-change-default-paths.patch | 68 ----------------- .../viewmol/files/2.4.1-remove-icc-check.patch | 22 ------ sci-chemistry/viewmol/metadata.xml | 11 --- sci-chemistry/viewmol/viewmol-2.4.1-r3.ebuild | 89 ---------------------- 5 files changed, 195 deletions(-) delete mode 100644 sci-chemistry/viewmol/Manifest delete mode 100644 sci-chemistry/viewmol/files/2.4.1-change-default-paths.patch delete mode 100644 sci-chemistry/viewmol/files/2.4.1-remove-icc-check.patch delete mode 100644 sci-chemistry/viewmol/metadata.xml delete mode 100644 sci-chemistry/viewmol/viewmol-2.4.1-r3.ebuild (limited to 'sci-chemistry/viewmol') diff --git a/sci-chemistry/viewmol/Manifest b/sci-chemistry/viewmol/Manifest deleted file mode 100644 index 7de430c5ed44..000000000000 --- a/sci-chemistry/viewmol/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX 2.4.1-change-default-paths.patch 2745 BLAKE2B c604ab1ffbe992b49671f0f1c713ce95fa2cec18b39d625856bdf8cbc226f8965f3fc13b22003a8ec812954daf2533cac4a001255e07a5cd3bf0eeaeed6524dd SHA512 9dda6e39f43706f9868eb02402137573d58e90b14940ad5d10ede6088e49d2ebd8a114ffda3cf4a69bee5874cc0a16b83bb4ea86281203765c5d861cb8dac6dd -AUX 2.4.1-remove-icc-check.patch 1020 BLAKE2B 63c0b2c68be4bc745f8dbc184f1ca90bc0b5e2964508e686c811cb1a3f46d5ed8f401f789fce8e8f15b89e1ccaf7a657a2de830c2e829d6782f285031a89ee3c SHA512 ea2a1a58730561fcf2bc05a0f23dc2108cf2fd97d228a7a6305d3323abda5ce3510793dbebf2253cef9e6d60326889079bc6a9639228b1b2bfd9d9a3b8c03ebb -DIST viewmol-2.4.1.src.tgz 2229379 BLAKE2B c7d3d9f0a0a728f13be718e2b85a645d1824d2c9efd920a05a0693dfb5904e18da20fcef8080e99f497280effdb71cb21c58d9aeadf49d2477e1c931caa49389 SHA512 42701d570d97e77b84597950a9068dfdf48faf4e551957383c8eea38f082c1ad136c17b7cbd3903673478506116d6fc08d1288842e74d6a9776526c685083584 -EBUILD viewmol-2.4.1-r3.ebuild 2225 BLAKE2B 74563226fe1bcbe418bde909f202eead15aedf7610a592f8d6d7ae1b2e0d47cf2bdec2a91e21772f978512ddbe0cc0739028694f85a2fa13adcaa9fe9e79a6c6 SHA512 b290d08a50662422876d093b973ba7b4e44fe759258325d1f796beb8f929575861a0b8367d52b1ab8a5976dea8e5b805894454867f32751fbd768bd6c9a3476c -MISC metadata.xml 342 BLAKE2B 3d43fda7cef989246f20968757c7c9710832915b5aa7623026185e69f79901fdeed5503c04a87d7395bcc0f9fd47313a017673903df74cc7a55999fb5c24467a SHA512 f77c63597bc5df26ba6dd136ee943f78562c5d99fefc1b435633c602a6eb3433600976884085ea8aa8f87f2f79fd495e9b51f918290bc1751e66d7515fe4e039 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 deleted file mode 100644 index 4b1edef7ef8b..000000000000 --- a/sci-chemistry/viewmol/files/2.4.1-change-default-paths.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/source/getrc.c b/source/getrc.c -index a39b436..c130096 100644 ---- a/getrc.c -+++ b/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/install -+++ b/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/files/2.4.1-remove-icc-check.patch b/sci-chemistry/viewmol/files/2.4.1-remove-icc-check.patch deleted file mode 100644 index fd91e0a5a434..000000000000 --- a/sci-chemistry/viewmol/files/2.4.1-remove-icc-check.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/getmachine -+++ b/getmachine -@@ -269,19 +269,11 @@ - makedir - cat ../.config.$os > makefile - use_icc=`type icc 2> /dev/null` -- if [ "$use_icc" = "" ] -- then - findProcessor - echo 'COMPILER=gcc' >> makefile - echo "OPT=-O6 -mcpu=$processor -fomit-frame-pointer -ffast-math -malign-double" >> makefile - echo 'CFLAGS=-Wall -I/usr/X11R6/include -DLINUX -Wno-strict-aliasing' >> makefile - echo "LDFLAGS=$LINKFORSHARED" >> makefile -- else -- echo 'COMPILER=icc' >> makefile -- echo 'OPT=-O2 -ipo' >> makefile -- echo 'CFLAGS=-I/opt/intel/compiler50/ia32/include -I/usr/X11R6/include -DLINUX' >> makefile -- echo "LDFLAGS=$LINKFORSHARED -ipo" >> makefile -- fi - echo 'SCANDIR=' >> makefile - echo 'INCLUDE=$(TIFFINCLUDE) -I$(PNGINCLUDE) -I$(PYTHONINCLUDE)' >> makefile - echo 'LIBRARY=$(LIBTIFF) $(LIBPNG) -L$(LIBPYTHON)' >> makefile diff --git a/sci-chemistry/viewmol/metadata.xml b/sci-chemistry/viewmol/metadata.xml deleted file mode 100644 index 335c7edd503b..000000000000 --- a/sci-chemistry/viewmol/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - sci-chemistry@gentoo.org - Gentoo Chemistry Project - - - viewmol - - diff --git a/sci-chemistry/viewmol/viewmol-2.4.1-r3.ebuild b/sci-chemistry/viewmol/viewmol-2.4.1-r3.ebuild deleted file mode 100644 index a82367bac3b7..000000000000 --- a/sci-chemistry/viewmol/viewmol-2.4.1-r3.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="tk(-)" - -inherit prefix python-single-r1 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="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - media-libs/libpng:0= - media-libs/tiff:0 - virtual/glu - virtual/opengl - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXt - x11-libs/motif:0 - ${PYTHON_DEPS}" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -S="${WORKDIR}/${P}/source" - -PATCHES=( - "${FILESDIR}"/${PV}-remove-icc-check.patch - "${FILESDIR}"/${PV}-change-default-paths.patch -) - -src_prepare() { - default - - eprefixify getrc.c - sed "s:GENTOOLIBDIR:$(get_libdir):g" -i install getrc.c || die - sed "s:GENTOODOCDIR:${PF}:g" -i install || die - - mkdir "$(uname -s)" || die - cd "$(uname -s)" || die - - cat >> ".config.$(uname -s)" <<- EOF || die - LIBTIFF = -L"${EPREFIX}/usr/$(get_libdir)" - TIFFINCLUDE = "${EPREFIX}/usr/include" - - LIBPNG = -L"${EPREFIX}/usr/$(get_libdir)" - PNGINCLUDE = "${EPREFIX}/usr/include" - - PYTHONVERSION = ${EPYTHON} - PYTHONINCLUDE = $(python_get_CFLAGS) - PYTHONLIB = $(python_get_LIBS) - - COMPILER = $(tc-getCC) - CFLAGS = ${CFLAGS} -DLINUX - LDFLAGS = ${LDFLAGS} - SCANDIR= - INCLUDE=\$(TIFFINCLUDE) -I\$(PNGINCLUDE) \$(PYTHONINCLUDE) - LIBRARY=\$(LIBTIFF) \$(LIBPNG) \$(PYTHONLIB) - LIBS=-L"${EPREFIX}/usr/$(get_libdir)" -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 || die - cat ../Makefile >> makefile || die -} - -src_compile() { - emake -C "$(uname -s)" viewmol_ tm_ bio_ readgamess_ readgauss_ readmopac_ readpdb_ - "${EPREFIX}"/bin/bash makeTranslations || die -} - -src_install() { - ./install "${ED%/}"/usr || die - - # fix broken layout - mv "${ED%/}"/usr/{usr/share,} || die - rm -rf "${ED%/}"/usr/usr || die - mv "${ED%/}"/usr/{$(get_libdir)/${PN}/locale,share} || die - mv "${ED%/}"/usr/{$(get_libdir),libexec} || die -} -- cgit v1.2.3