From: Alin Năstac Date: Wed, 27 Dec 2006 10:18:25 +0000 (+0000) Subject: Fix smsd database support (#158667). X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=535220dbef06c8dfe80d4aaa246a4affccfee3a9;p=gentoo.git Fix smsd database support (#158667). Package-Manager: portage-2.1.1-r2 --- diff --git a/app-mobilephone/gnokii/ChangeLog b/app-mobilephone/gnokii/ChangeLog index bdfd8c8063e0..9919dba78640 100644 --- a/app-mobilephone/gnokii/ChangeLog +++ b/app-mobilephone/gnokii/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-mobilephone/gnokii # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.46 2006/12/06 21:03:29 pylon Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.47 2006/12/27 10:18:25 mrness Exp $ + +*gnokii-0.6.14-r1 (27 Dec 2006) + + 27 Dec 2006; Alin Năstac +gnokii-0.6.14-r1.ebuild: + Fix smsd database support (#158667). 06 Dec 2006; Lars Weiler gnokii-0.6.14.ebuild: Stable on ppc. diff --git a/app-mobilephone/gnokii/Manifest b/app-mobilephone/gnokii/Manifest index 15a4f665e6e9..d0c4529394e4 100644 --- a/app-mobilephone/gnokii/Manifest +++ b/app-mobilephone/gnokii/Manifest @@ -31,6 +31,10 @@ EBUILD gnokii-0.6.12.ebuild 2400 RMD160 b218082f17f7ed3efc46839ced1e68cbb92e0dcf MD5 8c77945dda53c3bed89ed8ee5bc6d87b gnokii-0.6.12.ebuild 2400 RMD160 b218082f17f7ed3efc46839ced1e68cbb92e0dcf gnokii-0.6.12.ebuild 2400 SHA256 f6f70bba457758f8267cace36ed903c393682b725bdbb10688b6dbeafc1b4339 gnokii-0.6.12.ebuild 2400 +EBUILD gnokii-0.6.14-r1.ebuild 3652 RMD160 724983a37721e1285c509948731982e4a9ea903b SHA1 a8d798db184e1a076d43dadd4fefaf95a0db8381 SHA256 fc8a23afc805a41c4a2c545e04a6e55b4509137eef31fe8af02230ff7e336758 +MD5 6a31f9ddc77ebe719b034301372263bc gnokii-0.6.14-r1.ebuild 3652 +RMD160 724983a37721e1285c509948731982e4a9ea903b gnokii-0.6.14-r1.ebuild 3652 +SHA256 fc8a23afc805a41c4a2c545e04a6e55b4509137eef31fe8af02230ff7e336758 gnokii-0.6.14-r1.ebuild 3652 EBUILD gnokii-0.6.14.ebuild 2989 RMD160 a7bbcd306f65c5c078f81bc2a70bc45ac05bce6e SHA1 53b5ec995d6fbb3e5bea4977eb0fadbe3ce3ac5f SHA256 a38536e81049f883be3329340fd70a91ab027af2dfbe099f61db1c2457a73015 MD5 242f003e6a546890c6d501cce4983942 gnokii-0.6.14.ebuild 2989 RMD160 a7bbcd306f65c5c078f81bc2a70bc45ac05bce6e gnokii-0.6.14.ebuild 2989 @@ -47,10 +51,10 @@ EBUILD gnokii-0.6.8.ebuild 2324 RMD160 043734737342325c2c48b12904f75a558c2d0f49 MD5 6dd0b55f724bdefcc2cd45adcc7bfc09 gnokii-0.6.8.ebuild 2324 RMD160 043734737342325c2c48b12904f75a558c2d0f49 gnokii-0.6.8.ebuild 2324 SHA256 6d47c6aaa11d8766b077395f1fe9c5625bda93cc62cafcbd5445e90ab63f331e gnokii-0.6.8.ebuild 2324 -MISC ChangeLog 10322 RMD160 ac9d9e48a686e94d0b7905b9f31c9f6517071c4f SHA1 86d0751f4c115c9721e5263b9fe807acaf42cc27 SHA256 b87e941e312fcd863607cb5270270fae3b08eced735353c3a3ef6697e744ae4d -MD5 1aad950b7b027455657dae28c7ed7ccd ChangeLog 10322 -RMD160 ac9d9e48a686e94d0b7905b9f31c9f6517071c4f ChangeLog 10322 -SHA256 b87e941e312fcd863607cb5270270fae3b08eced735353c3a3ef6697e744ae4d ChangeLog 10322 +MISC ChangeLog 10470 RMD160 5a8f73acf076bc371c4fd23747c78905893e2df8 SHA1 cab0e9f01706b5730e0a5dd8dea947ae67aefc94 SHA256 80c97641fce68e41a89ae40bc68fedf061743b340078525552d7676a6d9b9363 +MD5 0e73d8bcb28bd05e00f6177b6a4c26d6 ChangeLog 10470 +RMD160 5a8f73acf076bc371c4fd23747c78905893e2df8 ChangeLog 10470 +SHA256 80c97641fce68e41a89ae40bc68fedf061743b340078525552d7676a6d9b9363 ChangeLog 10470 MISC metadata.xml 467 RMD160 f4f42815e8e048a9393a44da04ca01dac19c2cb5 SHA1 ffe70f8fab241fb7d19fb7807e6a04a5134fee6e SHA256 568184cf4297917d644b08f231861be42f00830d26e6c3789e3a4d65016430d6 MD5 01ec5e34cbf064fdf9a0862d481b01d9 metadata.xml 467 RMD160 f4f42815e8e048a9393a44da04ca01dac19c2cb5 metadata.xml 467 @@ -64,6 +68,9 @@ SHA256 03488b3b67f3daf0240f76f6c01503bc4ca78f8ec851338170b9478a1788dea1 files/di MD5 e11b217bdc80c76accbe14ddf2551844 files/digest-gnokii-0.6.14 247 RMD160 163a9f496688c3c4c75ed67cd6c717e12715f192 files/digest-gnokii-0.6.14 247 SHA256 b885674830291c32e9183bdb622e705eb8ac3b84448a0aabdc6f6c1030478296 files/digest-gnokii-0.6.14 247 +MD5 e11b217bdc80c76accbe14ddf2551844 files/digest-gnokii-0.6.14-r1 247 +RMD160 163a9f496688c3c4c75ed67cd6c717e12715f192 files/digest-gnokii-0.6.14-r1 247 +SHA256 b885674830291c32e9183bdb622e705eb8ac3b84448a0aabdc6f6c1030478296 files/digest-gnokii-0.6.14-r1 247 MD5 388f5e242175dbedd401b041f006c78b files/digest-gnokii-0.6.7-r1 244 RMD160 eabe1a889f24dac4746c98a4d4de7ad3f93a5c83 files/digest-gnokii-0.6.7-r1 244 SHA256 b84b1fcc7ffaddb23e4cb4e2e7c1c065452d3056e9f74b28c80cfbc808e51ba0 files/digest-gnokii-0.6.7-r1 244 diff --git a/app-mobilephone/gnokii/files/digest-gnokii-0.6.14-r1 b/app-mobilephone/gnokii/files/digest-gnokii-0.6.14-r1 new file mode 100644 index 000000000000..2f801c789991 --- /dev/null +++ b/app-mobilephone/gnokii/files/digest-gnokii-0.6.14-r1 @@ -0,0 +1,3 @@ +MD5 89449d613c7a7e765a0d8da57ef1bb88 gnokii-0.6.14.tar.bz2 1546845 +RMD160 471689e6ccbb2a81c0eb27a073e27f88ed71e3df gnokii-0.6.14.tar.bz2 1546845 +SHA256 cea63cddf79864d306198c7a84091af0b4685816b352ae253a3e2bfac5e67cb7 gnokii-0.6.14.tar.bz2 1546845 diff --git a/app-mobilephone/gnokii/gnokii-0.6.14-r1.ebuild b/app-mobilephone/gnokii/gnokii-0.6.14-r1.ebuild new file mode 100644 index 000000000000..f2951ffb20d4 --- /dev/null +++ b/app-mobilephone/gnokii/gnokii-0.6.14-r1.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.14-r1.ebuild,v 1.1 2006/12/27 10:18:25 mrness Exp $ + +inherit eutils flag-o-matic linux-info + +DESCRIPTION="user space driver and tools for use with mobile phones" +HOMEPAGE="http://www.gnokii.org/" +SRC_URI="http://www.gnokii.org/download/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="nls bluetooth ical irda sms postgres mysql usb X" + +RESTRICT="test" #test fails; maybe it will work in the future, but till then... + +RDEPEND="X? ( >=x11-libs/gtk+-2.8.19 ) + bluetooth? ( >=net-wireless/bluez-libs-2.25 ) + sms? ( >=dev-libs/glib-2.10.3 + postgres? ( >=dev-db/postgresql-8.0.8 ) + mysql? ( >=virtual/mysql-4.1 ) + ) + ical? ( >=dev-libs/libical-0.26.6 ) + usb? ( >=dev-libs/libusb-0.1.11 )" +DEPEND="${RDEPEND} + irda? ( virtual/os-headers ) + nls? ( >=sys-devel/gettext-0.14.5 ) + >=sys-devel/autoconf-2.59-r7 + >=app-text/recode-3.6-r2" + +CONFIG_CHECK="UNIX98_PTYS" + +src_unpack() { + unpack ${A} + cd "${S}" + + # Add proper conditional support for ical and usb USE flags + epatch "${FILESDIR}"/${P}-configure.in.patch + + if use sms ; then + local MY_SMSD_DB_OBJS="file.lo" + local MY_SMSD_DB_LIBS="libfile.la" + if use postgres; then + MY_SMSD_DB_OBJS="${MY_SMSD_DB_OBJS} pq.lo" + MY_SMSD_DB_LIBS="${MY_SMSD_DB_LIBS} libpq.la" + fi + if use mysql; then + MY_SMSD_DB_OBJS="${MY_SMSD_DB_OBJS} mysql.lo" + MY_SMSD_DB_LIBS="${MY_SMSD_DB_LIBS} libmysql.la" + 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/\(^.*LIBTOOL.*--mode=finish.*$\)/#\1/' \ + smsd/Makefile + + #Change default database module if pq not supported + if ! use postgres ; then + local MY_DEFAULT_DB_MODULE="file" + if use mysql ; then + MY_DEFAULT_DB_MODULE="mysql" + fi + sed -i -e "s/\"pq\"/\"${MY_DEFAULT_DB_MODULE}\"/" smsd/smsd.c + fi + fi +} + +src_compile() { + find po/ -name '*.po' -exec recode latin1..u8 {} \; + append-ldflags $(bindnow-flags) #avoid QA notices + + autoconf && econf \ + $(use_enable nls) \ + $(use_enable usb) \ + $(use_enable ical) \ + $(use_with X x) \ + --disable-debug \ + --disable-xdebug \ + --disable-rlpdebug \ + --enable-security \ + --disable-unix98test \ + || die "configure failed" + + + emake -j1 || die "make failed" + + if use sms; then + cd "${S}/smsd" + + emake || die "smsd make install failed" + + cd "${S}" + fi +} + +src_install() { + einstall || die "make install failed" + + if use X; then + insinto /usr/share/pixmaps + newins Docs/sample/logo/gnokii.xpm xgnokii.xpm + fi + + insinto /etc + doins Docs/sample/gnokiirc + sed -i -e 's:/usr/local:/usr:' "${D}/etc/gnokiirc" + + doman Docs/man/* + dodir "/usr/share/doc/${PF}" + cp -r Docs/sample "${D}/usr/share/doc/${PF}/sample" + cp -r Docs/protocol "${D}/usr/share/doc/${PF}/protocol" + rm -rf Docs/man Docs/sample Docs/protocol + dodoc Docs/* + + # only one file needs suid root to make a pseudo device + fperms 4755 /usr/sbin/mgnokiidev + + if use sms; then + cd "${S}/smsd" + + einstall || die "smsd make install failed" + + cd "${S}" + fi +} + +pkg_postinst() { + einfo "gnokii does not need it's own group anymore." + einfo "Make sure the user that runs gnokii has read/write access to the device" + einfo "which your phone is connected to. eg. chown /dev/ttyS0" + echo + ewarn "We received at least one report of gnokii with usb connection breaking the phone," + ewarn "which was in need to be serviced afterwards. Be careful if you decide to try that..." +}