Add fixes for bugs 304537, 418303, 422587, and 335238. Credit to Michael Mair-Keimberger for the fixes.

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 42618354)

2 files changed, 34 insertions, 15 deletions

diff --git a/app-mobilephone/smsclient/ChangeLog b/app-mobilephone/smsclient/ChangeLog
index d3e77a220ac4..3da37cbd65bd 100644
--- a/app-mobilephone/smsclient/ChangeLog
+++ b/app-mobilephone/smsclient/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-mobilephone/smsclient
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/smsclient/ChangeLog,v 1.8 2008/11/02 18:57:14 mrness Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/smsclient/ChangeLog,v 1.9 2013/08/21 18:58:44 creffett Exp $
+
+  21 Aug 2013; Chris Reffett <creffett@gentoo.org> smsclient-2.0.9a-r1.ebuild:
+  Add fixes for bugs 304537, 418303, 422587, and 335238. Credit to Michael Mair-
+  Keimberger for the fixes.
 
   02 Nov 2008; Alin Năstac <mrness@gentoo.org> smsclient-2.0.9a-r1.ebuild:
   Respect CC env variable (#243688).
@@ -42,4 +46,3 @@
   +files/smsclient-2.0.8y_sms-makefile.patch, +metadata.xml,
   +smsclient-2.0.8y.ebuild:
   Initial commit. Closes bug #109195
-
diff --git a/app-mobilephone/smsclient/smsclient-2.0.9a-r1.ebuild b/app-mobilephone/smsclient/smsclient-2.0.9a-r1.ebuild
index be8d27168ad2..5d76a59f0182 100644
--- a/app-mobilephone/smsclient/smsclient-2.0.9a-r1.ebuild
+++ b/app-mobilephone/smsclient/smsclient-2.0.9a-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/smsclient/smsclient-2.0.9a-r1.ebuild,v 1.3 2008/11/02 18:57:14 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/smsclient/smsclient-2.0.9a-r1.ebuild,v 1.4 2013/08/21 18:58:44 creffett Exp $
 
-inherit eutils toolchain-funcs
+EAPI="5"
+
+inherit eutils user
 
 DESCRIPTION="Utility to send SMS messages to mobile phones and pagers."
 HOMEPAGE="http://www.smsclient.org"
@@ -13,20 +15,32 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-src_unpack() {
-	unpack ${A}
+pkg_setup() {
+	enewgroup dialout
+}
 
+src_prepare() {
 	epatch "${FILESDIR}/${P}-gentoo.patch"
 	epatch "${FILESDIR}/${P}-sender.patch"
+	sed -i -e \
+		"s:\$(CFLAGS) -o:\$(CFLAGS) \$(LDFLAGS) -o:g" \
+		src/client/Makefile
+}
+
+src_configure() {
+	rm .configured && ./configure
 }
 
 src_compile() {
-	rm .configured && ./configure || die "Configure failed"
-	emake CC="$(tc-getCC)" || die "Make failed"
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR) rc" \
+		RANLIB="$(tc-getRANLIB)" \
+		LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
+	emake DESTDIR="${D}" install
 	dosym sms_client /usr/bin/smsclient
 	dosym sms_address /usr/bin/smsaddress
 
@@ -35,14 +49,16 @@ src_install() {
 	diropts
 
 	doman docs/sms_client.1
-	dodoc Authors Changelog* FAQ README* TODO docs/sms_protocol
+	dodoc AUTHORS Changelog* FAQ README* TODO docs/sms_protocol
 }
 
-pkg_postinst() {
+pkg_config() {
 	local MY_LOGFILE="${ROOT}/var/log/smsclient.log"
 	[ -f "${MY_LOGFILE}" ] || touch "${MY_LOGFILE}"
-	chgrp dialout "${MY_LOGFILE}"
-	chmod g+rwx,o-rwx "${MY_LOGFILE}"
+	fowners :dialout "${MY_LOGFILE}"
+	fperms g+rwx,o-rwx "${MY_LOGFILE}"
+}
 
+pkg_postinst() {
 	einfo "If you run sms_client as normal user, make sure you are member of dialout group."
 }