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/prekin/Manifest | 2 +- sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild | 38 ++++++++++------------- 2 files changed, 18 insertions(+), 22 deletions(-) (limited to 'sci-chemistry/prekin') diff --git a/sci-chemistry/prekin/Manifest b/sci-chemistry/prekin/Manifest index 1d1e0de863e4..8ef0a2f31be5 100644 --- a/sci-chemistry/prekin/Manifest +++ b/sci-chemistry/prekin/Manifest @@ -1,5 +1,5 @@ AUX 6.51.081122-Makefile.patch 1456 BLAKE2B 769c5237659ddc6abcbeea88d620993b7c52f77ee4b12a8bb200e452b0e5dd8fe41ba2c18056439998ba7d2dea90351e2fc7997cc71e5ec447e128e3c1535b62 SHA512 96b8cda8fc71b2e72c0e8e0a70560a7928456fe81aaa40810a8bcbe77835a7242e8e0d39fac3258e5848a4e4ac14bf9d7dfd4dff8385eb983f359a9f85af9838 AUX 6.51.081122-overflow.patch 1156 BLAKE2B 86c70ec89564972a451d23a41863969e31b2d0b866c0282728625fe200928aaf87bec7751e8df3fefbce6c2d4f0a21aba13b1d117247ab6b2b14c7d1db2e45b8 SHA512 fe0ff6e3432177653d29ef51ef3a767dc3872fc0a5350c786b3623b6b4d63866fbfbaf4369676feb545766cac5620b209bd87e92c0ecf2280bb39470e7dd5f7b DIST prekin.6.51.081122.src.tgz 350756 BLAKE2B 657706e83d06be74f2565abb4db1c886c19247b736200cf309cc143f71c7f47e4c85d869b286ec3e250ecb0d714e1454044836001aa6b883513d9149683bb320 SHA512 9a41f30a9de955c78ee5685807482b2b073705643cceb53bf57eaf7c0c4753dc88fa8dc19f09d4c8a07124c3c3c73716f29126860ae37ff4dd6fb6178b829d1f -EBUILD prekin-6.51.081122-r1.ebuild 1052 BLAKE2B 8738d2f9cf0f55938eacc0c9871431913ef36ad819835cee717f9f021d5600bae001e28abf87ebad60f7205817efa561e0f9f7fcba8ba01056f922ff9cf85939 SHA512 5149cbb41bc53b92c2c6c467d30adb271c32cd7233480ed0d6c2bf01f61d7b1f159c44cb656aafe1c6cfffb918aba2d448723a0700725a70e8369fb90691d776 +EBUILD prekin-6.51.081122-r1.ebuild 934 BLAKE2B c24b0ffb0d9e7ef0fb1a7519cc7eb8d126f0ebb3b4a9754ae7966cc9d6f9415b293f74ebe5617a3e141a34793d1f35dfbe0e980cf4f9b353b3828d4cfd922204 SHA512 1ad9797f5778a892f6e604ab43973f06b18c30acdb9570b0613b1de730dfa2e51ce449426d58ae83613ed5bfb9fb2f05b27913c4e53764b92a34b062f1e5f395 MISC metadata.xml 261 BLAKE2B 509ce9958149f9cd522a2c68dd0d23ed851d19d02494611456592897093378d180a6006cddf1575fd60106119e72726255c49db2e10fde1b370bdf2f3cf8c94a SHA512 72682d17ec2b918131b551bd1ff41004965d3cf0c00d24222b34741d2eabf601cf36d4266be70ba7fb7bd0ab55d9dcb5b8e4ca41125bc31f176516797459c8c7 diff --git a/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild b/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild index 8bea9cc52301..db0c34eca49b 100644 --- a/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild +++ b/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="2" +EAPI=6 -inherit toolchain-funcs eutils multilib +inherit toolchain-funcs MY_P=${PN}.${PV} @@ -16,37 +16,33 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="X" -RDEPEND="x11-libs/libXext +RDEPEND=" + x11-libs/libXext x11-libs/libXmu x11-libs/libX11 x11-libs/libXt - X? ( >=x11-libs/motif-2.3:0 )" + X? ( >=x11-libs/motif-2.3:0= )" DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} +PATCHES=( + "${FILESDIR}"/${PV}-Makefile.patch + "${FILESDIR}"/${PV}-overflow.patch +) -src_prepare() { - epatch \ - "${FILESDIR}"/${PV}-Makefile.patch \ - "${FILESDIR}"/${PV}-overflow.patch - sed \ +src_configure() { + tc-export CC + + sed \ -e 's:cc:$(CC):g' \ -e "s:GENTOOLIBDIR:$(get_libdir):g" \ - "${S}"/Makefile.linux > Makefile || die + Makefile.linux > Makefile || die } src_compile() { - local mytarget - - if use X; then - mytarget="${PN}" - else - mytarget="nogui" - fi - - emake CC="$(tc-getCC)" ${mytarget} || die + emake $(usex X ${PN} nogui) } src_install() { - dobin "${S}"/prekin || die + dobin prekin } -- cgit v1.2.3