6 files changed, 74 insertions, 82 deletions
diff --git a/sci-chemistry/chemtool/Manifest b/sci-chemistry/chemtool/Manifest
index c00e99f4df16..abaf7e287ad2 100644
--- a/sci-chemistry/chemtool/Manifest
+++ b/sci-chemistry/chemtool/Manifest
@@ -1,6 +1,6 @@
-AUX 1.6.13-no-underlinking.patch 2251 BLAKE2B b12f78d61891b877ce64111f404d6490b086baf169b43d1b41cbb2efd4a99c2b8d7bd20199b0ca82fea6695e9e09081a8ad000f478c8aa96e5543c8e92e7a57f SHA512 42d623e2875118350a3c4a1979483ccd1de535f8a6ceec7fb9554661a8f91c3403d2cfc207891ac1f71ae7fda4486e48c74bc6621dc76eb2740a7c5f68caaeb9
-DIST chemtool-1.6.13.tar.gz 838868 BLAKE2B 18bca95fafae69de98e0507d820d596a62f4fdd923f6bd79964c7561b732b53bb0bede0f2b6db2ab2d834fa229af7ac3b4b8051895bb53c964ad185b5283813c SHA512 6c248321f73b6eab4ad21e810639a1f0b14cc30db9c9fdc8fe66ee218bd88ead5e74f1f047f5badcb91b515827c2eddc64b28ead380d9b14ab5b76777e7134dd
+AUX chemtool-1.6.14-fix-tests.patch 99 BLAKE2B 6e682ccc080eee9c9b504cccaf3515cec97733ef2c8bb26c7708ddde2ccfe31fd51fc441c012f68e098c9f08e643de1bb8e423f43f3d47e97cbc1b20649a1540 SHA512 e6a4cdb9471e2e92b124c1a283accbd5744c551759e1db373bed6e5ef988edb33bf5f38083d2c581069d09def802be05379ad928c4f9fe285bc9bb15b1134b9e
+AUX chemtool-1.6.14-fno-common.patch 685 BLAKE2B dacb9935c915d1858d828ccbc3c7c6cdc8c5a7fbe045c60b39655da85c9d7d7837af58e8fd11f27ec99d2d5e9751fa286c5772460b6fdb80e93af96704bd5a87 SHA512 0caf5d217ec3ffda7afc4fc5241e31f64141c878277ee0a123a4a653be09604c4661722cec029d818a1c682fb6857bda8f14a2110b12fb570fa0ac6586c90380
+AUX chemtool-1.6.14-no-underlinking.patch 2251 BLAKE2B b12f78d61891b877ce64111f404d6490b086baf169b43d1b41cbb2efd4a99c2b8d7bd20199b0ca82fea6695e9e09081a8ad000f478c8aa96e5543c8e92e7a57f SHA512 42d623e2875118350a3c4a1979483ccd1de535f8a6ceec7fb9554661a8f91c3403d2cfc207891ac1f71ae7fda4486e48c74bc6621dc76eb2740a7c5f68caaeb9
 DIST chemtool-1.6.14.tar.gz 817735 BLAKE2B 065c5069402b5960fc2c9b686a9c0e9954b98c43a1d70385ca56e8407fffbe09fd87023f1f7177140745987c69731766f64a8b8015370ef38593bbcd3f073e64 SHA512 066c83c61aced3134b081767e788143a047889a2fee4b6535c2b0a3166bccc73d75981e1cf35b7bcaa5b8fe2e0227b28693b659decd82f7783cb4082ac6ed2bd
-EBUILD chemtool-1.6.13.ebuild 1169 BLAKE2B 1b41e3ff1671c6b0213bcfcf50e756a1b11e1a7b3d99750fc69a51713808e9dde1fbb5836c2b23a91254d6c10bd8403a63c373ea5bff0340bb28670e62895471 SHA512 d3135ea531d93cf3e0465e3350e78da8cd9e4acda8517bbd29fb1547fd4f8dce3b7acbde0c6b9cd535c74834129a53e79dd72a3ee39d40348f9bbb7bd07eaf71
-EBUILD chemtool-1.6.14.ebuild 1172 BLAKE2B 152734a8bd0bb0aaa094427b675a87035f08938cb377bb9ddacc1a8fc9e5595f843cff1c677579e529c93a363253842c6fa70e5c9fb2f1df5cc2eaeaf9776a80 SHA512 25684162b9f93c42ce81b69f22f71d112acc5d65fef1e26bbf6c980887c852e0130d0c9fb0babc360c1c5e3b41391cf4473cce0dba0d88400e99a6fe87114b72
+EBUILD chemtool-1.6.14.ebuild 1191 BLAKE2B 0be0de974463132ce63148062cc0a771c17eec4de6125c2039c786fd86975dcd0615186b42c3b6f5a6785f2b8a84269c89c9ad70fd705bbfea5a85b6ffda1da5 SHA512 07ac2328bcb1810bc103ff4f3381e043720e6eef57cdb73f2eb4b62770570d769d4650f5f58e78fea748e571c5ab58303435f39ba7fcdba94b88e5b7b1a3b3eb
 MISC metadata.xml 335 BLAKE2B e8a970d66f40b47ae6b3bcdc54fc6435a08428ccd1675aecaa91e0935d13c887fb91a97e82cd48d57b8867ccbbfe1087d562a5c80106c7bd2c3f92793694b35e SHA512 b02a3fd1101bd4ffb01ffd327b307f802fdb126492eea9dd98b86a87a367e669ba5ed4d94d5fecc4528c94abfd90d41e6215c91a34a64b95d0a2e7c2060a76b7
diff --git a/sci-chemistry/chemtool/chemtool-1.6.13.ebuild b/sci-chemistry/chemtool/chemtool-1.6.13.ebuild
deleted file mode 100644
index 8eb6ec996db2..000000000000
--- a/sci-chemistry/chemtool/chemtool-1.6.13.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils eutils
-
-DESCRIPTION="A GTK program for drawing organic molecules"
-HOMEPAGE="http://ruby.chemie.uni-freiburg.de/~martin/chemtool/"
-SRC_URI="http://ruby.chemie.uni-freiburg.de/~martin/chemtool/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="emf gnome nls"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-gfx/transfig
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/pango
-	emf? ( media-libs/libemf )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-no-underlinking.patch
-	)
-
-src_configure() {
-	local myeconfargs=(
-		--without-kdedir
-		$(use_with gnome gnomedir /usr)
-		$(use_enable emf)
-		--enable-undo
-		--enable-menu
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	insinto /usr/share/${PN}/examples
-	doins "${S}"/examples/*
-	if ! use nls; then rm -rf "${ED}"/usr/share/locale || die; fi
-
-	insinto /usr/share/pixmaps
-	doins chemtool.xpm
-	make_desktop_entry ${PN} Chemtool ${PN} "Education;Science;Chemistry"
-}
diff --git a/sci-chemistry/chemtool/chemtool-1.6.14.ebuild b/sci-chemistry/chemtool/chemtool-1.6.14.ebuild
index 58a5d56b105e..3d2d12c9a70c 100644
--- a/sci-chemistry/chemtool/chemtool-1.6.14.ebuild
+++ b/sci-chemistry/chemtool/chemtool-1.6.14.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils eutils
+inherit autotools desktop
 
 DESCRIPTION="A GTK program for drawing organic molecules"
 HOMEPAGE="http://ruby.chemie.uni-freiburg.de/~martin/chemtool/"
@@ -23,34 +21,41 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/pango
 	emf? ( media-libs/libemf )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/1.6.13-no-underlinking.patch
+	"${FILESDIR}"/${P}-no-underlinking.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-fix-tests.patch
 )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
-	local myeconfargs=(
-		--without-kdedir
-		$(use_with gnome gnomedir /usr)
+	econf \
+		--enable-undo \
+		--enable-menu \
+		--without-kdedir \
+		$(use_with gnome gnomedir "${EPREFIX}"/usr) \
 		$(use_enable emf)
-		--enable-undo
-		--enable-menu
-		)
-	autotools-utils_src_configure
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 
-	insinto /usr/share/${PN}/examples
-	doins "${S}"/examples/*
-	if ! use nls; then rm -rf "${ED}"/usr/share/locale || die; fi
+	insinto /usr/share/chemtool/examples
+	doins -r examples/.
 
 	insinto /usr/share/pixmaps
 	doins chemtool.xpm
-	make_desktop_entry ${PN} Chemtool ${PN} "Education;Science;Chemistry"
+
+	if ! use nls; then
+		rm -rf "${ED}"/usr/share/locale || die
+	fi
+
+	make_desktop_entry chemtool Chemtool chemtool "Education;Science;Chemistry"
 }
diff --git a/sci-chemistry/chemtool/files/chemtool-1.6.14-fix-tests.patch b/sci-chemistry/chemtool/files/chemtool-1.6.14-fix-tests.patch
new file mode 100644
index 000000000000..755ae3f01914
--- /dev/null
+++ b/sci-chemistry/chemtool/files/chemtool-1.6.14-fix-tests.patch
@@ -0,0 +1,6 @@
+--- /dev/null
++++ b/src-cht/Makefile.am
+@@ -0,0 +1,3 @@
++bin_PROGRAMS = cht
++
++cht_SOURCES = cht.c
diff --git a/sci-chemistry/chemtool/files/chemtool-1.6.14-fno-common.patch b/sci-chemistry/chemtool/files/chemtool-1.6.14-fno-common.patch
new file mode 100644
index 000000000000..d782f8e4a625
--- /dev/null
+++ b/sci-chemistry/chemtool/files/chemtool-1.6.14-fno-common.patch
@@ -0,0 +1,37 @@
+--- a/ct1.h
++++ b/ct1.h
+@@ -273,12 +273,12 @@
+ extern float importfactor;
+ extern int importoffset;
+ 
+-char **intype;
+-char **inmode;
+-int babelin;
+-char **outtype;
+-char **outmode;
+-int babelout;
++extern char **intype;
++extern char **inmode;
++extern int babelin;
++extern char **outtype;
++extern char **outmode;
++extern int babelout;
+ extern char *babel;
+ extern GdkGC *mygc[8],*background_gc,*hlgc;
+ extern int curpen;
+--- a/inout.c
++++ b/inout.c
+@@ -30,6 +30,13 @@
+ extern GdkFont *font[7],*smallfont[7],*symbfont[7],*boldfont[7],*slfont[7];
+ #endif
+ 
++char **intype;
++char **inmode;
++int babelin;
++char **outtype;
++char **outmode;
++int babelout;
++
+ static char babeloutp[4];
+ 
+ int
diff --git a/sci-chemistry/chemtool/files/1.6.13-no-underlinking.patch b/sci-chemistry/chemtool/files/chemtool-1.6.14-no-underlinking.patch
index 5d2fe36d6bf1..5d2fe36d6bf1 100644
--- a/sci-chemistry/chemtool/files/1.6.13-no-underlinking.patch
+++ b/sci-chemistry/chemtool/files/chemtool-1.6.14-no-underlinking.patch