Fixes by Mike Benson to cope with the less forgiving behaviour of GNU Make 4.0; closes bug #408676.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB5058F9A)

6 files changed, 30 insertions, 206 deletions

diff --git a/app-mobilephone/smstools/ChangeLog b/app-mobilephone/smstools/ChangeLog
index 1b71269153ec..6a353674801e 100644
--- a/app-mobilephone/smstools/ChangeLog
+++ b/app-mobilephone/smstools/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-mobilephone/smstools
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/smstools/ChangeLog,v 1.20 2013/12/22 09:39:34 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/smstools/ChangeLog,v 1.21 2014/05/06 12:18:49 chainsaw Exp $
+
+*smstools-3.1.15-r2 (06 May 2014)
+
+  06 May 2014; Tony Vroon <chainsaw@gentoo.org> -smstools-3.1.14.ebuild,
+  -smstools-3.1.14-r1.ebuild, -smstools-3.1.14-r2.ebuild,
+  -smstools-3.1.15.ebuild, +smstools-3.1.15-r2.ebuild,
+  +files/3.1.15-makefile-whitespace.patch:
+  Fixes by Mike Benson to cope with the less forgiving behaviour of GNU Make
+  4.0; closes bug #408676.
 
 *smstools-3.1.15-r1 (22 Dec 2013)
 
diff --git a/app-mobilephone/smstools/files/3.1.15-makefile-whitespace.patch b/app-mobilephone/smstools/files/3.1.15-makefile-whitespace.patch
new file mode 100644
index 000000000000..70455bef6c56
--- /dev/null
+++ b/app-mobilephone/smstools/files/3.1.15-makefile-whitespace.patch
@@ -0,0 +1,11 @@
+--- smstools3/src/Makefile.old	2014-04-25 23:28:46.324045112 +1000
++++ smstools3/src/Makefile	2014-04-25 23:33:26.453061496 +1000
+@@ -43,7 +43,7 @@
+ 
+ ifneq (,$(findstring SOLARIS,$(CFLAGS)))
+ ifeq (,$(findstring DISABLE_INET_SOCKET,$(CFLAGS)))
+-override LFLAGS += -lsocket -lnsl
++	override LFLAGS += -lsocket -lnsl
+ endif
+ endif
+ 
diff --git a/app-mobilephone/smstools/smstools-3.1.14-r1.ebuild b/app-mobilephone/smstools/smstools-3.1.14-r1.ebuild
deleted file mode 100644
index f3c55506867a..000000000000
--- a/app-mobilephone/smstools/smstools-3.1.14-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/smstools/smstools-3.1.14-r1.ebuild,v 1.2 2012/06/02 05:02:33 zmedico Exp $
-
-EAPI=4
-inherit toolchain-funcs user
-
-DESCRIPTION="Send and receive short messages through GSM modems"
-HOMEPAGE="http://smstools3.kekekasvi.com/"
-SRC_URI="http://smstools3.kekekasvi.com/packages/smstools3-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="stats"
-
-DEPEND=""
-RDEPEND="sys-process/procps
-	stats? ( >=dev-libs/mm-1.4.0 )"
-
-S="${WORKDIR}/${PN}3"
-
-pkg_setup() {
-	enewgroup sms
-	enewuser smsd -1 -1 /var/spool/sms sms
-}
-
-src_prepare() {
-	if use stats; then
-		sed -i -e "s:CFLAGS += -D NOSTATS:#CFLAGS += -D NOSTATS:" \
-			"${S}/src/Makefile"
-	fi
-}
-
-src_compile() {
-	cd src
-	emake CC="$(tc-getCC)" LFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dobin src/smsd
-	cd scripts
-	dobin sendsms sms2html sms2unicode unicode2sms
-	dobin hex2bin hex2dec email2sms
-	dodoc mysmsd smsevent smsresend sms2xml sql_demo smstest.php
-	dodoc checkhandler-utf-8 eventhandler-utf-8 forwardsms regular_run
-	cd ..
-
-	keepdir /var/spool/sms/incoming
-	keepdir /var/spool/sms/outgoing
-	keepdir /var/spool/sms/checked
-	chown -R smsd:sms "${D}"/var/spool/sms
-	chmod g+s "${D}"/var/spool/sms/incoming
-
-	newinitd "${FILESDIR}"/smsd.initd2 smsd
-	insopts -o smsd -g sms -m0644
-	insinto /etc
-	newins examples/smsd.conf.easy smsd.conf
-	dohtml -r doc
-}
-
-pkg_postinst() {
-	touch "${ROOT}"/var/log/smsd.log
-	chown -f smsd:sms "${ROOT}"/var/log/smsd.log
-}
diff --git a/app-mobilephone/smstools/smstools-3.1.14-r2.ebuild b/app-mobilephone/smstools/smstools-3.1.14-r2.ebuild
deleted file mode 100644
index 57ebfe5b608c..000000000000
--- a/app-mobilephone/smstools/smstools-3.1.14-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/smstools/smstools-3.1.14-r2.ebuild,v 1.2 2012/06/02 05:02:33 zmedico Exp $
-
-EAPI=4
-
-inherit toolchain-funcs user
-
-DESCRIPTION="Send and receive short messages through GSM modems"
-HOMEPAGE="http://smstools3.kekekasvi.com/"
-SRC_URI="http://smstools3.kekekasvi.com/packages/smstools3-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="stats"
-
-DEPEND=""
-RDEPEND="sys-process/procps
-	stats? ( >=dev-libs/mm-1.4.0 )"
-
-S="${WORKDIR}/${PN}3"
-
-pkg_setup() {
-	enewgroup sms
-	enewuser smsd -1 -1 /var/spool/sms sms
-}
-
-src_prepare() {
-	if use stats; then
-		sed -i -e "s:CFLAGS += -D NOSTATS:#CFLAGS += -D NOSTATS:" \
-			"${S}/src/Makefile" || die
-	fi
-	echo "CFLAGS += ${CFLAGS}" >> src/Makefile || die
-}
-
-src_compile() {
-	cd src || die
-	emake \
-		CC="$(tc-getCC)" \
-		LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin src/smsd
-	cd scripts || die
-	dobin sendsms sms2html sms2unicode unicode2sms
-	dobin hex2bin hex2dec email2sms
-	dodoc mysmsd smsevent smsresend sms2xml sql_demo \
-		smstest.php checkhandler-utf-8 eventhandler-utf-8 \
-		forwardsms regular_run
-	cd .. || die
-
-	keepdir /var/spool/sms/incoming
-	keepdir /var/spool/sms/outgoing
-	keepdir /var/spool/sms/checked
-	fowners -R smsd:sms /var/spool/sms
-	fperms g+s /var/spool/sms/incoming
-
-	newinitd "${FILESDIR}"/smsd.initd2 smsd
-	insopts -o smsd -g sms -m0644
-	insinto /etc
-	newins examples/smsd.conf.easy smsd.conf
-	dohtml -r doc
-}
-
-pkg_postinst() {
-	touch "${ROOT}"/var/log/smsd.log || die
-	chown -f smsd:sms "${ROOT}"/var/log/smsd.log
-}
diff --git a/app-mobilephone/smstools/smstools-3.1.14.ebuild b/app-mobilephone/smstools/smstools-3.1.14.ebuild
deleted file mode 100644
index 9047fc489135..000000000000
--- a/app-mobilephone/smstools/smstools-3.1.14.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/smstools/smstools-3.1.14.ebuild,v 1.2 2012/06/02 05:02:33 zmedico Exp $
-
-EAPI=4
-inherit toolchain-funcs user
-
-DESCRIPTION="Send and receive short messages through GSM modems"
-HOMEPAGE="http://smstools3.kekekasvi.com/"
-SRC_URI="http://smstools3.kekekasvi.com/packages/smstools3-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="stats"
-
-DEPEND=""
-RDEPEND="sys-process/procps
-	stats? ( >=dev-libs/mm-1.4.0 )"
-
-S="${WORKDIR}/${PN}3"
-
-pkg_setup() {
-	enewgroup sms
-	enewuser smsd -1 -1 /var/spool/sms sms
-}
-
-src_prepare() {
-	if use stats; then
-		sed -i -e "s:CFLAGS += -D NOSTATS:#CFLAGS += -D NOSTATS:" \
-			"${S}/src/Makefile"
-	fi
-}
-
-src_compile() {
-	cd src
-	emake CC="$(tc-getCC)" LFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dobin src/smsd
-	cd scripts
-	dobin sendsms sms2html sms2unicode unicode2sms
-	dobin hex2bin hex2dec email2sms
-	dodoc mysmsd smsevent smsresend sms2xml sql_demo smstest.php
-	dodoc checkhandler-utf-8 eventhandler-utf-8 forwardsms regular_run
-	cd ..
-
-	keepdir /var/spool/sms/incoming
-	keepdir /var/spool/sms/outgoing
-	keepdir /var/spool/sms/checked
-	chown -R smsd:sms "${D}"/var/spool/sms
-	chmod g+s "${D}"/var/spool/sms/incoming
-
-	newinitd "${FILESDIR}"/smsd.initd smsd
-	insopts -o smsd -g sms -m0644
-	insinto /etc
-	newins examples/smsd.conf.easy smsd.conf
-	dohtml -r doc
-}
-
-pkg_postinst() {
-	touch "${ROOT}"/var/log/smsd.log
-	chown -f smsd:sms "${ROOT}"/var/log/smsd.log
-}
diff --git a/app-mobilephone/smstools/smstools-3.1.15.ebuild b/app-mobilephone/smstools/smstools-3.1.15-r2.ebuild
index 2274a3eab4d8..fdc05973fc4f 100644
--- a/app-mobilephone/smstools/smstools-3.1.15.ebuild
+++ b/app-mobilephone/smstools/smstools-3.1.15-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/smstools/smstools-3.1.15.ebuild,v 1.1 2012/12/20 10:41:42 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/smstools/smstools-3.1.15-r2.ebuild,v 1.1 2014/05/06 12:18:49 chainsaw Exp $
 
-EAPI=4
+EAPI=5
 
-inherit toolchain-funcs user
+inherit systemd toolchain-funcs user eutils
 
 DESCRIPTION="Send and receive short messages through GSM modems"
 HOMEPAGE="http://smstools3.kekekasvi.com/"
@@ -27,6 +27,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${PV}-makefile-whitespace.patch"
 	if use stats; then
 		sed -i -e "s:CFLAGS += -D NOSTATS:#CFLAGS += -D NOSTATS:" \
 			"${S}/src/Makefile" || die
@@ -62,6 +63,9 @@ src_install() {
 	insinto /etc
 	newins examples/smsd.conf.easy smsd.conf
 	dohtml -r doc
+
+	systemd_dounit "${FILESDIR}"/smsd.service
+	systemd_newtmpfilesd "${FILESDIR}"/smsd.tmpfiles smsd.conf
 }
 
 pkg_postinst() {