From 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 19 Apr 2018 14:14:48 +0100 Subject: gentoo resync : 19.04.2018 --- sci-chemistry/elem/Manifest | 5 +- sci-chemistry/elem/elem-1.0.3-r1.ebuild | 31 ----------- sci-chemistry/elem/elem-1.0.3-r2.ebuild | 31 ++++++----- .../elem/files/elem-1.0.3-fix-build-system.patch | 65 ++++++++++++++++++++++ .../elem/files/elem-1.0.3-missing-stdlib.patch | 9 +++ 5 files changed, 95 insertions(+), 46 deletions(-) delete mode 100644 sci-chemistry/elem/elem-1.0.3-r1.ebuild create mode 100644 sci-chemistry/elem/files/elem-1.0.3-fix-build-system.patch create mode 100644 sci-chemistry/elem/files/elem-1.0.3-missing-stdlib.patch (limited to 'sci-chemistry/elem') diff --git a/sci-chemistry/elem/Manifest b/sci-chemistry/elem/Manifest index 419abe3b4650..db952304a6d8 100644 --- a/sci-chemistry/elem/Manifest +++ b/sci-chemistry/elem/Manifest @@ -1,4 +1,5 @@ +AUX elem-1.0.3-fix-build-system.patch 2544 BLAKE2B 174bfc3e2036a17d918534d02b51def6d933e8799c15cc3e6b75a8580155be614b5691b3241e1fcf88ea7e8124c3e65d73101d862c21f7603a9a8b794d640e6a SHA512 2d691f1d0fdc0a786a45706b68243fab17706328e0417cf805f657576c462315551719a7168ad8e58e651c695a0d53da3f776f479dc540b6b01af899e1b97208 +AUX elem-1.0.3-missing-stdlib.patch 133 BLAKE2B 2ab00632e93401db578910b4e44e8f0ad4e899fb3afce5b9d1b6612ba181fd0fc3922c8cc229404164bdef562850337f006cce4047e52b2e459954419bc05529 SHA512 769c5e19928ed64b5595cd37f16d4df893889c3c0ea7e6673e182646bcaca89a6e46e7c6611c586c9213a417c439de043c0beb84a9543e478f78e4d9843a1c3e DIST elem-src-1.0.3-Linux.tgz 58364 BLAKE2B bdedb844ca62f928fdae5b01b13b88e5f43f5e37f40b47f7b8b9b1a2cb11053b9aefa7b1b4bb78a8632f3329f37afeadfc34eddee1b9f7cd109bee89aa9cdf32 SHA512 24b163c5cc3019c1beb677ce7b432b21289352f7cdbad686ab9161c628d3aadbb90d8abf9bef49f1c7d077b706bbd4ea6b381f356cc85adf907f3c15a4f4893c -EBUILD elem-1.0.3-r1.ebuild 668 BLAKE2B 20d89d85a70dca3aadccb29360535f1799b5683e4ade3fec5a56e61d04b5407dc33d63ae875aeedd9a171de6ea28cce451c17a9a66576bf85f1d1850c55f99ea SHA512 b83e43f0cc8198e19276e6b85e3f48c045c9c5f569718507c93bec4215cdd9dbb5e29575f204db23269a6a4e016071fa3e0778e60f9a858424188f3fe4fe3e6c -EBUILD elem-1.0.3-r2.ebuild 801 BLAKE2B edb28ba6fb92772b9718311a533dc48e0d6721a8f6a95639af1b2a00292946bbbf2ffcb6e2fbb25fb369cdae2ae1e654ddf079df8e59d9ccfaa7d0ecb7a776d4 SHA512 4a13dd36dd4c09ab9a4af15a6d1f0f4b6f07421a2a41e5a5fddce083448635a64ded03011f393b868c720691e184332541628bc7ad62f48e1bd7e9c3e28d1e5b +EBUILD elem-1.0.3-r2.ebuild 665 BLAKE2B 865ddeecb1c7c9be1d3467d320454bf057359d84cd8cf4566c475d605d9355c83a34c452e5cac1505c362521ea7c720a60d1b9b7aeea25f6f58b43dc29b3f3e1 SHA512 e00037731116bab8060dddf9d461f607299b564e201053101afe2129bfb69d9080831801eb391a21f03365f6ad65b2e2216ea2c0b4597d94c7923862b272b8c3 MISC metadata.xml 339 BLAKE2B 73c4ef3e56cdf6f1061537c5c3a3932b7c38af40ec483cb4f12c21722a65dbeb0ce2dc162911a96a8f4147150a232eb398e2a4fecf7bde60ba2738994dc7a534 SHA512 daecddff7728e2a0b00d5e16bb4fc1c88bd316783f8921705dc76b41f427a8918ead92e663fa202ff57508242daa454cae2c04057c8bf9cf767b95d59e43c177 diff --git a/sci-chemistry/elem/elem-1.0.3-r1.ebuild b/sci-chemistry/elem/elem-1.0.3-r1.ebuild deleted file mode 100644 index eafbb9c4c0b7..000000000000 --- a/sci-chemistry/elem/elem-1.0.3-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit toolchain-funcs - -DESCRIPTION="periodic table of the elements" -HOMEPAGE="http://elem.sourceforge.net/" -SRC_URI="mirror://sourceforge/elem/${PN}-src-${PV}-Linux.tgz" -LICENSE="GPL-2" -KEYWORDS="amd64 sparc x86" -SLOT="0" -IUSE="" - -DEPEND="x11-libs/xforms" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${A} - cd "${S}" - sed -e 's:\(^LIBS = .*\):\1 -lXpm:' -i Makefile || die "sed failed" -} - -src_compile () { - emake COMPILER="$(tc-getCC)" FLAGS="${CFLAGS}" all || die "Build failed." -} - -src_install () { - into /usr - dobin elem elem-de elem-en - dohtml -r doc/* -} diff --git a/sci-chemistry/elem/elem-1.0.3-r2.ebuild b/sci-chemistry/elem/elem-1.0.3-r2.ebuild index 5a9a8c132cf3..daade3396d36 100644 --- a/sci-chemistry/elem/elem-1.0.3-r2.ebuild +++ b/sci-chemistry/elem/elem-1.0.3-r2.ebuild @@ -1,34 +1,39 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +EAPI=6 + inherit toolchain-funcs DESCRIPTION="periodic table of the elements" HOMEPAGE="http://elem.sourceforge.net/" SRC_URI="mirror://sourceforge/elem/${PN}-src-${PV}-Linux.tgz" + LICENSE="GPL-2" -KEYWORDS="~amd64 ~sparc ~x86" +KEYWORDS="amd64 sparc x86" SLOT="0" IUSE="" DEPEND="x11-libs/xforms" RDEPEND="${DEPEND}" -src_unpack() { - unpack ${A} - cd "${S}" - sed -e 's:\(^LIBS = .*\):\1 -lXpm:' \ - -e "s:\${FLAGS} -o elem:\$(LDFLAGS) &:" \ - -i Makefile || die #336190 - sed -e "/string.h/ i #include " \ - -i elem_cb.c || die #implicit exit() +PATCHES=( + "${FILESDIR}"/${P}-fix-build-system.patch + "${FILESDIR}"/${P}-missing-stdlib.patch +) + +src_configure() { + tc-export CC } src_compile () { - emake COMPILER="$(tc-getCC)" FLAGS="${CFLAGS}" all || die "Build failed." + emake all } src_install () { - dobin elem elem-de elem-en || die - dohtml -r doc/* || die + dobin elem elem-de elem-en + + rm -rf doc/CVS || die + HTML_DOCS=( doc/. ) + einstalldocs } diff --git a/sci-chemistry/elem/files/elem-1.0.3-fix-build-system.patch b/sci-chemistry/elem/files/elem-1.0.3-fix-build-system.patch new file mode 100644 index 000000000000..b89f226e46a7 --- /dev/null +++ b/sci-chemistry/elem/files/elem-1.0.3-fix-build-system.patch @@ -0,0 +1,65 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,8 +1,4 @@ +-COMPILER=gcc +-LIBS = -lm -L./ -lforms -L/usr/X11R6/lib -lX11 -lnsl +-INCLUDE=-I/usr/X11R6/include/X11 -I/usr/include -I/usr/X11R6/include -I/usr/local/X11/include/ -I/usr/X/include/ +-FLAGS = -g -O2 +-DESTDIR = ++LIBS = -lm -L./ -lforms + + + default: +@@ -35,7 +31,7 @@ + @echo "erzeuge deutsche Version von elem" + + elem-de: elem_main_de.o elem_cb_de.o elem_de.o deutsch.h +- ${COMPILER} ${FLAGS} -o elem-de elem_main_de.o elem_cb_de.o elem_de.o ${LIBS} -DDEUTSCH ++ $(CC) $(LDFLAGS) $(CFLAGS) -o elem-de elem_main_de.o elem_cb_de.o elem_de.o $(LIBS) + + + +@@ -43,34 +39,34 @@ + @echo "creating english version of elem" + + elem-en: elem_main_en.o elem_cb_en.o elem_en.o english.h +- ${COMPILER} ${FLAGS} -o elem-en elem_main_en.o elem_cb_en.o elem_en.o ${LIBS} -DENGLISH ++ $(CC) $(LDFLAGS) $(CFLAGS) -o elem-en elem_main_en.o elem_cb_en.o elem_en.o $(LIBS) + + static-de : elem_main_de.o elem_cb_de.o elem_de.o +- ${COMPILER} ${FLAGS} -static -o elem-static-de elem_main_de.o elem_cb_de.o elem_de.o ${LIBS} -DDEUTSCH ++ $(CC) $(LDFLAGS) $(CFLAGS) -static -o elem-static-de elem_main_de.o elem_cb_de.o elem_de.o $(LIBS) + + static-en : elem_main_en.o elem_cb_en.o elem_en.o +- ${COMPILER} ${FLAGS} -static -o elem-static-en elem_main_en.o elem_cb_en.o elem_en.o ${LIBS} -DENGLISH ++ $(CC) $(LDFLAGS) $(CFLAGS) -static -o elem-static-en elem_main_en.o elem_cb_en.o elem_en.o $(LIBS) + + + + + elem_main_de.o : elem_main.c elem.h deutsch.h +- ${COMPILER} ${FLAGS} -DDEUTSCH -o elem_main_de.o -c elem_main.c ${INCLUDE} ++ $(CC) $(CFLAGS) $(CPPFLAGS) -DDEUTSCH -o elem_main_de.o -c elem_main.c + + elem_main_en.o : elem_main.c elem.h english.h +- ${COMPILER} ${FLAGS} -DENGLISH -o elem_main_en.o -c elem_main.c ${INCLUDE} ++ $(CC) $(CFLAGS) $(CPPFLAGS) -DENGLISH -o elem_main_en.o -c elem_main.c + + + elem_cb_de.o : elem_cb.c elem.h deutsch.h +- ${COMPILER} ${FLAGS} -DDEUTSCH -o elem_cb_de.o -c elem_cb.c ${INCLUDE} ++ $(CC) $(CFLAGS) $(CPPFLAGS) -DDEUTSCH -o elem_cb_de.o -c elem_cb.c + elem_cb_en.o : elem_cb.c elem.h english.h +- ${COMPILER} ${FLAGS} -DENGLISH -o elem_cb_en.o -c elem_cb.c ${INCLUDE} ++ $(CC) $(CFLAGS) $(CPPFLAGS) -DENGLISH -o elem_cb_en.o -c elem_cb.c + + + elem_de.o : elem.c elem.h +- ${COMPILER} ${FLAGS} -DDEUTSCH -o elem_de.o -c elem.c ${INCLUDE} ++ $(CC) $(CFLAGS) $(CPPFLAGS) -DDEUTSCH -o elem_de.o -c elem.c + elem_en.o : elem.c elem.h +- ${COMPILER} ${FLAGS} -DENGLISH -o elem_en.o -c elem.c ${INCLUDE} ++ $(CC) $(CFLAGS) $(CPPFLAGS) -DENGLISH -o elem_en.o -c elem.c + + + install-de: deutsch diff --git a/sci-chemistry/elem/files/elem-1.0.3-missing-stdlib.patch b/sci-chemistry/elem/files/elem-1.0.3-missing-stdlib.patch new file mode 100644 index 000000000000..e1937734a51c --- /dev/null +++ b/sci-chemistry/elem/files/elem-1.0.3-missing-stdlib.patch @@ -0,0 +1,9 @@ +--- a/elem_cb.c ++++ b/elem_cb.c +@@ -1,5 +1,6 @@ + #include "forms.h" + #include "elem.h" ++#include + #include + + -- cgit v1.2.3