Cope with changes occured in smsd source (#189181).

Package-Manager: portage-2.1.2.11

4 files changed, 25 insertions, 20 deletions

diff --git a/app-mobilephone/gnokii/ChangeLog b/app-mobilephone/gnokii/ChangeLog
index 54a3c2bbdcfd..3afb8a38498a 100644
--- a/app-mobilephone/gnokii/ChangeLog
+++ b/app-mobilephone/gnokii/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-mobilephone/gnokii
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.59 2007/08/16 20:40:38 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.60 2007/08/17 07:48:04 mrness Exp $
+
+*gnokii-0.6.18-r1 (17 Aug 2007)
+
+  17 Aug 2007; Alin Năstac <mrness@gentoo.org> -gnokii-0.6.18.ebuild,
+  +gnokii-0.6.18-r1.ebuild:
+  Cope with changes occured in smsd source (#189181).
 
 *gnokii-0.6.18 (16 Aug 2007)
 
diff --git a/app-mobilephone/gnokii/Manifest b/app-mobilephone/gnokii/Manifest
index dbb8c0cbf764..83d767f29834 100644
--- a/app-mobilephone/gnokii/Manifest
+++ b/app-mobilephone/gnokii/Manifest
@@ -20,14 +20,14 @@ EBUILD gnokii-0.6.17.ebuild 3869 RMD160 6b83aeb2571de69d1553ebe173bf28ae489c349e
 MD5 60c375652b34fc8111290565ea348983 gnokii-0.6.17.ebuild 3869
 RMD160 6b83aeb2571de69d1553ebe173bf28ae489c349e gnokii-0.6.17.ebuild 3869
 SHA256 8c68fd8cd586a45a5a318de63846c94f796d7acfd6fc9f47d29af79094b25464 gnokii-0.6.17.ebuild 3869
-EBUILD gnokii-0.6.18.ebuild 3933 RMD160 0bc4da581d3cd62409a0eb63ca334f66071c2f89 SHA1 677c7e4c10584ae76d137bc95671321ab137e9ef SHA256 6df0590d6d3037382c2cdb260a9f58748ddf5ff4727b81acb14fc0421146bd67
-MD5 74621c5c1fa6c0723b81026af0b7251f gnokii-0.6.18.ebuild 3933
-RMD160 0bc4da581d3cd62409a0eb63ca334f66071c2f89 gnokii-0.6.18.ebuild 3933
-SHA256 6df0590d6d3037382c2cdb260a9f58748ddf5ff4727b81acb14fc0421146bd67 gnokii-0.6.18.ebuild 3933
-MISC ChangeLog 12449 RMD160 d4c0e061502c2a239cd5fde5198d5b89e3073356 SHA1 68a0dc5e342e3eeed098ba7f2c7bf7da46889686 SHA256 a8475ff13b154437fa83fddb896dd66175c5a5ba703273c4e0c74c98bf9efaf5
-MD5 5511d85de6fbf6d02f2367c6f210e8fe ChangeLog 12449
-RMD160 d4c0e061502c2a239cd5fde5198d5b89e3073356 ChangeLog 12449
-SHA256 a8475ff13b154437fa83fddb896dd66175c5a5ba703273c4e0c74c98bf9efaf5 ChangeLog 12449
+EBUILD gnokii-0.6.18-r1.ebuild 3903 RMD160 b69700d526c6a773493bba4fa960ca33587c6da4 SHA1 6ceaf2c697a1584abf65fc9672dac8b3640ec613 SHA256 8442787d1e762d457cc576097d9718386029a6b719a8c9b68481a9da54020149
+MD5 4571b9ae2a906405e639480add69f216 gnokii-0.6.18-r1.ebuild 3903
+RMD160 b69700d526c6a773493bba4fa960ca33587c6da4 gnokii-0.6.18-r1.ebuild 3903
+SHA256 8442787d1e762d457cc576097d9718386029a6b719a8c9b68481a9da54020149 gnokii-0.6.18-r1.ebuild 3903
+MISC ChangeLog 12636 RMD160 43c11ed81319b99dbf2f8b6ef48ec4bfc6f0e345 SHA1 b31454260d4015ab6b9d156d17bac87dfb3bb67d SHA256 3b0cb7ec4676f21bd45736fd5b1269a202f4752c75fe9554b0eabbfb9583b53a
+MD5 b2ec18257e9a2727cb408c3be8f35a0e ChangeLog 12636
+RMD160 43c11ed81319b99dbf2f8b6ef48ec4bfc6f0e345 ChangeLog 12636
+SHA256 3b0cb7ec4676f21bd45736fd5b1269a202f4752c75fe9554b0eabbfb9583b53a ChangeLog 12636
 MISC metadata.xml 467 RMD160 f4f42815e8e048a9393a44da04ca01dac19c2cb5 SHA1 ffe70f8fab241fb7d19fb7807e6a04a5134fee6e SHA256 568184cf4297917d644b08f231861be42f00830d26e6c3789e3a4d65016430d6
 MD5 01ec5e34cbf064fdf9a0862d481b01d9 metadata.xml 467
 RMD160 f4f42815e8e048a9393a44da04ca01dac19c2cb5 metadata.xml 467
@@ -38,13 +38,13 @@ SHA256 b885674830291c32e9183bdb622e705eb8ac3b84448a0aabdc6f6c1030478296 files/di
 MD5 9953d2b00cb021c880a2eda135508749 files/digest-gnokii-0.6.17 247
 RMD160 b2a23d8def7dbcb14ee6b5358b0ac13eb4930e9c files/digest-gnokii-0.6.17 247
 SHA256 9ce6ec41b068ad4089a34897aa70d350166ab0b59d960dc6e91852728d110055 files/digest-gnokii-0.6.17 247
-MD5 c83ad9a5ce9913b317c8546e4788d1fb files/digest-gnokii-0.6.18 247
-RMD160 88e780b2865256a59d76a4309247a9f0de683b9c files/digest-gnokii-0.6.18 247
-SHA256 b91f363ec23694b47eed3a6a171a620251fe26b9d90b79441d6c453fecdd007c files/digest-gnokii-0.6.18 247
+MD5 c83ad9a5ce9913b317c8546e4788d1fb files/digest-gnokii-0.6.18-r1 247
+RMD160 88e780b2865256a59d76a4309247a9f0de683b9c files/digest-gnokii-0.6.18-r1 247
+SHA256 b91f363ec23694b47eed3a6a171a620251fe26b9d90b79441d6c453fecdd007c files/digest-gnokii-0.6.18-r1 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGxLZQVSA5X31g7/gRAorQAKCGovxxEWIrofnkHQXN95k2HL3yhACgkKJv
-4I4mrSv86To5UTZjElIn/IU=
-=nnVN
+iD8DBQFGxVK/VSA5X31g7/gRArKhAKCXdLlQDAOjaKDUwNwE6fjk4VemuwCfbFco
+MR464TCHc/i2pJee8Q4D2Ps=
+=Ltbv
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/gnokii/files/digest-gnokii-0.6.18 b/app-mobilephone/gnokii/files/digest-gnokii-0.6.18-r1
index fb6429c0c807..fb6429c0c807 100644
--- a/app-mobilephone/gnokii/files/digest-gnokii-0.6.18
+++ b/app-mobilephone/gnokii/files/digest-gnokii-0.6.18-r1
diff --git a/app-mobilephone/gnokii/gnokii-0.6.18.ebuild b/app-mobilephone/gnokii/gnokii-0.6.18-r1.ebuild
index 5335e8463689..11dcf49153ec 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.18.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.18-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.18.ebuild,v 1.1 2007/08/16 20:40:38 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.18-r1.ebuild,v 1.1 2007/08/17 07:48:04 mrness Exp $
 
 inherit eutils flag-o-matic linux-info autotools
 
@@ -48,8 +48,8 @@ src_unpack() {
 		fi
 
 		sed -i \
-			-e "s/^DB_OBJS.*=.*file[.]lo/DB_OBJS = ${MY_SMSD_DB_OBJS}/" \
-			-e "s/^DB_LIBS.*=.*libfile[.]la/DB_LIBS = ${MY_SMSD_DB_LIBS}/" \
+			-e "s/^\(DB_OBJS[\t ]*=\).*$/\1 ${MY_SMSD_DB_OBJS}/" \
+			-e "s/^\(DB_LIBS[\t ]*=\).*$/\1 ${MY_SMSD_DB_LIBS}/" \
 			-e 's/\(^.*LIBTOOL.*--mode=finish.*$\)/#\1/' \
 			smsd/Makefile
 
@@ -60,8 +60,7 @@ src_unpack() {
 		elif use mysql ; then
 			MY_DEFAULT_DB_MODULE="mysql"
 		fi
-		[[ ${MY_DEFAULT_DB_MODULE} == "file" ]] || \
-				sed -i -e "s/\"file\"/\"${MY_DEFAULT_DB_MODULE}\"/" smsd/smsd.c
+		sed -i -e "s/\(smsdConfig[.]dbMod[\t ]*=.*\"\).*\(\"\)/\1${MY_DEFAULT_DB_MODULE}\2/" smsd/smsd.c
 	fi
 
 	eautoconf