Merge updates from master

5 files changed, 41 insertions, 112 deletions

diff --git a/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild b/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild
index ac42da98fd17..7120c3470b44 100644
--- a/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild
+++ b/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools eutils
+inherit eutils
 
 DESCRIPTION="An advanced suite for testing the randomness of RNG's"
 HOMEPAGE="http://www.phy.duke.edu/~rgb/General/dieharder.php"
@@ -37,11 +37,6 @@ pkg_setup() {
 	)
 }
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_compile() {
 	emake -j1
 	use doc && emake -C manual
diff --git a/net-dialup/cutecom/Manifest b/net-dialup/cutecom/Manifest
index eae601004228..c36ed6566973 100644
--- a/net-dialup/cutecom/Manifest
+++ b/net-dialup/cutecom/Manifest
@@ -1 +1,2 @@
 DIST cutecom-0.22.0.tar.gz 23208 SHA256 1b6620a6159cf3d50bb36cce544e91486817df7f1d553bf239d6db6108dd2ea5 SHA512 507b42b943f20d07429c3629ebdf358ca6551a57a2addc4c8560993b7c2d1304ef258f7d2ac8c62b13bcdfc797574b7e1dfac8b0c0086072407de7f71a2d0a26 WHIRLPOOL f74aea1478de99e9e3d2232451097b3090aff4ba685969cf4363aa2b0c76db079000a7e2991d790548c52bf79f31a3a11d193d1dc781aed2e34555cf2a68dd13
+DIST cutecom-0.40.0.tar.gz 813238 SHA256 4a8583cccabe98e12442d7ebd8f0752348bad1a59b990c703574f22c0360bf9f SHA512 63df993fee01d73c40180a6b92d49e5200ae14db0275690f59ff02cfd2b6f573623cf74fb6d5dcabc292314642bb9cf2d9bd274a4094917f70418c30209bb403 WHIRLPOOL 870d7eae8b73e29656abb69066584f54f7d7a60ef8cd495c344668a23456456f51000cf2296a3951ba6d7267213077cd1c4febf13aa671702afa67922380f6a7
diff --git a/net-dialup/cutecom/cutecom-0.40.0.ebuild b/net-dialup/cutecom/cutecom-0.40.0.ebuild
new file mode 100644
index 000000000000..552e006cf0db
--- /dev/null
+++ b/net-dialup/cutecom/cutecom-0.40.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils
+
+DESCRIPTION="CuteCom is a serial terminal, like minicom, written in qt"
+HOMEPAGE="https://github.com/neundorf/CuteCom"
+SRC_URI="https://codeload.github.com/neundorf/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtserialport:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}
+	net-dialup/lrzsz"
+
+S="${WORKDIR}/CuteCom-${PV}"
+
+src_prepare() {
+	sed -i \
+		-e '/Path/d' \
+		-e '/Terminal/s/0/false/' \
+		${PN}.desktop || die 'sed on desktop file failed'
+
+	cmake-utils_src_prepare
+}
+
+src_install() {
+	cmake-utils_src_install
+	domenu ${PN}.desktop
+	doicon distribution/${PN}.png
+}
diff --git a/net-misc/iaxmodem/Manifest b/net-misc/iaxmodem/Manifest
index 91a248e3dffa..479ed3d5632e 100644
--- a/net-misc/iaxmodem/Manifest
+++ b/net-misc/iaxmodem/Manifest
@@ -1,2 +1 @@
-DIST iaxmodem-1.2.0.tar.gz 3075769 SHA256 fa263c0df0870cb8133c4bee141146ca5db47ece6db50899a6acf508d76591ed SHA512 53b66a0977366541ffaa743fcbefa11c20eb9ea7182245a1d11bc7fd015d98a4ec8086b3cb85b8de84f63d67221bccb1a868fe9f0a603de600023ea158909707 WHIRLPOOL a258b663909cd7d8aa8be0e543a5cbd482ce978bd95534959cd300f96572b199d538fb1e6d7b8ec07fffda33b6e5c446065db89d1bbe50fe199492e191a418f1
 DIST iaxmodem-1.3.0.tar.gz 2483995 SHA256 9dcff90bbc41846e5c3919ca92687df4b17f54d8df692940b8c67c4e98287535 SHA512 3add8fe1c228ee63f12a3d23fcc8bad5405b9fa6af70cadbcdb276d4e7dfe2a90f1b7c300d35659ab0247010c2315e25a5def5715e670071226bd89271d004f4 WHIRLPOOL 52502bdda06ec3bf128b738c0f7f59ea668961dbd70c31b873374c195bbbf23d0a1fb103d4b4baf313ec83a2c2d438e3a1db8bed772d5e5c0662f32741216c1e
diff --git a/net-misc/iaxmodem/iaxmodem-1.2.0-r1.ebuild b/net-misc/iaxmodem/iaxmodem-1.2.0-r1.ebuild
deleted file mode 100644
index 08ea1debae0e..000000000000
--- a/net-misc/iaxmodem/iaxmodem-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="Software modem that uses an IAX channel instead of a traditional phone line"
-HOMEPAGE="https://sourceforge.net/projects/iaxmodem/"
-SRC_URI="mirror://sourceforge/iaxmodem/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-RDEPEND="media-libs/tiff:=
-	sys-process/procps"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# fix header file position
-	sed -i -e 's:iax/iax-client\.h:iax-client.h:g' iaxmodem.c || die
-
-	# fix broken line terminators
-	sed -i -e 's:\r::g' -e 's:--s$:--:g' -e 's:$:\r:g' iaxmodem.inf || die
-
-	# fix installation of libiax2 headers (though we don't need them)
-	sed -i -e 's: \(\$(includedir)/\): $(DESTDIR)\1:g' lib/libiax2/src/Makefile.in || die
-
-	# patch configure (we compile libs for ourself)
-	sed -i -e 's:^\(cd\|./configure\):# \1:g' configure || die
-	sed -i -e 's:build-libiax build-libspandsp ::g' Makefile.in || die
-
-	# fix dumb x86_64 libdir handling
-	sed -i -e 's: \(x86_64-\*)\): _DISABLED_\1:g' lib/spandsp/configure || die
-}
-
-src_configure() {
-	cd "${S}/lib/libiax2" || die
-	econf --disable-static \
-		--libdir=/usr/$(get_libdir)/iaxmodem \
-		--datadir=/usr/share/iaxmodem/libiax2
-
-	cd "${S}/lib/spandsp" || die
-	econf --disable-static \
-		--libdir=/usr/$(get_libdir)/iaxmodem \
-		--datadir=/usr/share/iaxmodem
-
-	cd "${S}"
-	./configure || die "configure iaxmodem failed" || die
-}
-
-src_compile() {
-	cd "${S}/lib/libiax2" || die
-	emake
-
-	cd "${S}/lib/spandsp" || die
-	emake
-
-	cd "${S}"
-	emake OBJS="iaxmodem.o" CC=$(tc-getCC) \
-		LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/$(get_libdir)/iaxmodem \
-			-Llib/spandsp/src/.libs -Llib/libiax2/src/.libs -lm -lutil -ltiff -lspandsp -liax"
-}
-
-src_install() {
-	cd "${S}/lib/libiax2" || die
-	emake DESTDIR="${D}" install
-
-	cd "${S}/lib/spandsp" || die
-	emake DESTDIR="${D}" install
-
-	cd "${S}"
-	dosbin iaxmodem
-
-	# remove libiax and spandsp headers, we don't need them
-	rm -rf "${D}usr/include" "${D}usr/bin/iax-config" || die
-
-	# install init-script + conf
-	newinitd "${FILESDIR}/iaxmodem.initd" iaxmodem
-	newconfd "${FILESDIR}/iaxmodem.confd" iaxmodem
-
-	# install docs
-	doman iaxmodem.1
-	newdoc CHANGES ChangeLog
-	newdoc lib/libiax2/ChangeLog ChangeLog.libiax2
-	newdoc lib/spandsp/ChangeLog ChangeLog.spandsp
-	dodoc FAQ README lib/spandsp/DueDiligence
-
-	# install sample configs
-	insinto /etc/iaxmodem
-	newins "${FILESDIR}/iaxmodem.cfg" default
-	insinto /usr/share/iaxmodem
-	doins config.ttyIAX iaxmodem-cfg.ttyIAX iaxmodem.inf
-
-	# install logrotate rule
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/iaxmodem.logrotated" iaxmodem
-
-	# create log dir
-	keepdir /var/log/iaxmodem
-}