revision bump to include latest capi enabled yaps.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 i686

4 files changed, 151 insertions, 2 deletions

diff --git a/app-mobilephone/yaps/ChangeLog b/app-mobilephone/yaps/ChangeLog
index 3ff57b3651e3..fe929e9576d6 100644
--- a/app-mobilephone/yaps/ChangeLog
+++ b/app-mobilephone/yaps/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-mobilephone/yaps
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/ChangeLog,v 1.20 2008/10/26 22:58:47 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/ChangeLog,v 1.21 2008/10/27 01:58:52 sbriesen Exp $
+
+*yaps-0.96-r3 (27 Oct 2008)
+
+  27 Oct 2008; Stefan Briesenick <sbriesen@gentoo.org>
+  +files/yaps-0.96-gentoo.diff, +yaps-0.96-r3.ebuild:
+  revision bump to include latest capi enabled yaps.
 
   26 Oct 2008; Stefan Briesenick <sbriesen@gentoo.org> yaps-0.96-r2.ebuild:
   fixed CC/CXX variable handling using tc-getCC/CXX, solving bug #243692.
diff --git a/app-mobilephone/yaps/Manifest b/app-mobilephone/yaps/Manifest
index f49acc7bac19..102a2f60b1ea 100644
--- a/app-mobilephone/yaps/Manifest
+++ b/app-mobilephone/yaps/Manifest
@@ -1,6 +1,9 @@
+AUX yaps-0.96-gentoo.diff 1554 RMD160 8957fedb29b5b436d865da887731874f2ff8ec8f SHA1 ed3aadceb9a0f0254017c2b7e878475e6f15c1f5 SHA256 3ba28d9b6f527ed9fec12bb8ea35e46f33adb80bd8d5ca5bd81405bedea0574c
 AUX yaps-0.96-gentoo.patch 10303 RMD160 ce80bbc2bd246517f098ecae414a1c0d76972eab SHA1 0fd62ff7b04447269a84aaf9abc79bb9951d844c SHA256 49f90677f9b52fa2ac0335825da866c45e62c2098a1c527061e08af4c7ebbb05
 DIST yaps-0.96.c3.tgz 108723 RMD160 957d4c10db43405452f231aa84c67fb9617432e2 SHA1 0d1d4f85a6b2fd021baae2f4fbf163204497eb75 SHA256 6f2a43a42004295ac855d12061f319be6fb8c3c82dc78d0ece8f6664376f59aa
+DIST yaps-0.96.c4.tgz 109682 RMD160 9747a98fbf7bff4ad9f978743dc1f63137fbee26 SHA1 a87dc354f525b0a9a731ab6078ea4af950a36cfd SHA256 4afab43b8f0bed7c48d91cef56bc7aee44a1887c38efb8788be3ec761caf54c9
 DIST yaps-0.96.tar.gz 91060 RMD160 38b08bf3fab015ab21bfc589277495e0eade275f SHA1 9fdd06337d63ef7b4b17d2c48c26e010f1355f8d SHA256 6474a507d1f3d769c80562164ad38454c73fb49be043bab1128ca9eaf20c5b98
 EBUILD yaps-0.96-r2.ebuild 1668 RMD160 81e3d628eb63fdb4118fc90bdfde2f8fcc8e2a6c SHA1 bf57dd23ac10cb636f3f9591e86256c29c4f3e9a SHA256 1adb82602e9aca8b4f33a09686c9a248195c5c22a4a9c0b0b41b7d687d3cd062
-MISC ChangeLog 2838 RMD160 21ce13ba7b804fa6747bec86d55b181a14f7e6dc SHA1 a406c44a173ae5c88d262d984aeae67e7b72935e SHA256 1182ed9b6f275995c55f9e95e3e86bc5554b5e596c9de2a82d6979fe5a5a83fb
+EBUILD yaps-0.96-r3.ebuild 2349 RMD160 97eb43f340d5ce6ba42f03e73932e1eeb245e7d8 SHA1 56bc7cd8358bd9b28d4498a7557814cb864652ba SHA256 2bb82fd95ca6836ace2c493332b09b03ba27f6d0bbe78f96d4b8423a73cdb829
+MISC ChangeLog 3030 RMD160 a452ead99ad53119854ad78df0b9c8b681c20b82 SHA1 ff18c30119988f38dcdaa8b39f2fc183d176e376 SHA256 65e225c92a7c4933f507bc66e3d8cc1db37503d3ce974028f100907b81f20d01
 MISC metadata.xml 428 RMD160 4733f0837c3189a45d818587c0298b8d80d83e5c SHA1 214d19b2e49e55b6fd569f6900cabc4f3245e0e7 SHA256 376b9b1390694cc5ab61c14a2ae350afdcb06772bbc488f362d7a9656372d90f
diff --git a/app-mobilephone/yaps/files/yaps-0.96-gentoo.diff b/app-mobilephone/yaps/files/yaps-0.96-gentoo.diff
new file mode 100644
index 000000000000..98f528c30116
--- /dev/null
+++ b/app-mobilephone/yaps/files/yaps-0.96-gentoo.diff
@@ -0,0 +1,56 @@
+--- Config.orig	2005-06-02 20:28:35.000000000 +0200
++++ Config	2005-10-16 15:13:32.000000000 +0200
+@@ -24,9 +24,9 @@
+ #	Name of local configuration file (location is $HOME.)
+ YAPS_LCFGFILE 	= .yapsrc
+ #	Directory for installing the binary
+-YAPS_BINDIR	= /usr/local/bin
++YAPS_BINDIR	= /usr/bin
+ #	Directory for optional support files
+-YAPS_LIBDIR	= /usr/local/lib/yaps
++YAPS_LIBDIR	= /usr/lib/yaps
+ #	User/Group/Mode for yaps
+ YAPS_USER	= bin
+ YAPS_GROUP	= uucp
+@@ -43,12 +43,12 @@
+ ifdef	SLANG
+ LDEFS	+= -DSCRIPT_SLANG
+ LLIBS	+= -lslang
+-MATH	= True
++#MATH	= True
+ endif
+ ifdef	LUA
+ LDEFS	+= -DSCRIPT_LUA
+-LLIBS	+= -llualib -llua
+-MATH	= True
++LLIBS	+= `pkg-config --libs lua`
++#MATH	= True
+ endif
+ ifdef	MATH
+ LLIBS	+= -lm
+--- Makefile.orig	2005-06-02 20:33:27.000000000 +0200
++++ Makefile	2005-10-16 15:13:32.000000000 +0200
+@@ -33,19 +33,19 @@
+ 	lynx -cfg=/dev/null -nolist -dump $< > $@
+ 
+ install:	$(DSTFLE) $(CFGFILE)
+-	if [ ! -d $(YAPS_LIBDIR) ]; then \
+-		install -d -m 755 -o $(YAPS_USER) -g $(YAPS_GROUP) $(YAPS_LIBDIR) ; \
++	if [ ! -d $(DESTDIR)$(YAPS_LIBDIR) ]; then \
++		install -d -m 755 $(DESTDIR)$(YAPS_LIBDIR) ; \
+ 	fi
+ 	@if [ -f contrib/Makefile ]; then	\
+ 		$(MAKE) -C contrib install ;	\
+ 	fi
+ 
+ $(DSTFLE):	yaps
+-	install -o $(YAPS_USER) -g $(YAPS_GROUP) -m $(YAPS_MODE) -s yaps $@
++	install -m $(YAPS_MODE) -s yaps $(DESTDIR)$@
+ 
+ $(CFGFILE):	yaps.rc
+ 	@if [ ! -f $@ ]; then \
+-		install -o $(YAPS_RCUSER) -g $(YAPS_RCGROUP) -m $(YAPS_RCMODE) -s yaps.rc $@ ; \
++		install -m $(YAPS_RCMODE) -s yaps.rc $(DESTDIR)$@ ; \
+ 	fi
+ 
+ clean:
diff --git a/app-mobilephone/yaps/yaps-0.96-r3.ebuild b/app-mobilephone/yaps/yaps-0.96-r3.ebuild
new file mode 100644
index 000000000000..b9934ce5730b
--- /dev/null
+++ b/app-mobilephone/yaps/yaps-0.96-r3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/yaps-0.96-r3.ebuild,v 1.1 2008/10/27 01:58:52 sbriesen Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Yet Another Pager Software (optional with CAPI support)"
+HOMEPAGE="ftp://sunsite.unc.edu/pub/Linux/apps/serialcomm/machines/"
+SRC_URI="capi? ( ftp://ftp.melware.net/capi4yaps/${P}.c4.tgz )
+	!capi? ( ftp://sunsite.unc.edu/pub/Linux/apps/serialcomm/machines/${P}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="capi lua slang unicode"
+
+RDEPEND="capi? ( net-dialup/capi4k-utils )
+	slang? ( >=sys-libs/slang-1.4 )
+	lua? ( dev-lang/lua )"
+DEPEND="${RDEPEND}
+	!capi? ( sys-apps/sed )
+	lua? ( dev-util/pkgconfig )"
+
+pkg_setup() {
+	if ! use capi; then
+		ewarn
+		ewarn "You are now compiling some *very* old and unmaintained stuff!"
+		ewarn
+		ewarn "YAPS with CAPI 2.0 support is actively maintained, but needs"
+		ewarn "net-dialup/capi4k-utils installed. But I advice you to use"
+		ewarn "this version, since it can still be used with an ordinary"
+		ewarn "modem (that's what you probably wanted). So just add 'capi'"
+		ewarn "to your USE flags to get the new and maintained version."
+		ewarn
+		ebeep
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	use capi && mv -f "${S}.c4" "${S}"
+	cd "${S}"
+
+	# apply patches
+	epatch "${FILESDIR}/${P}-gentoo.diff"
+
+	# fix compile warning
+	use capi || \
+	sed -i -e 's:^\(.*\)\(<stdlib.h>\):\1\2\n\1<string.h>:g' scr.c
+
+	# if specified, convert all relevant files from latin1 to UTF-8
+	if use unicode; then
+		for i in yaps.doc; do
+			einfo "Converting '${i}' to UTF-8"
+			iconv -f latin1 -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
+		done
+	fi
+}
+
+src_compile() {
+	local myconf=""
+	use lua && myconf="${myconf} LUA=True"
+	use slang && myconf="${myconf} SLANG=True"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}" ${myconf} || die "emake failed"
+}
+
+src_install() {
+	dobin yaps
+	insinto /etc
+	doins yaps.rc
+	keepdir /usr/lib/yaps
+	doman yaps.1
+	dohtml yaps.html
+	dodoc BUGREPORT COPYRIGHT README yaps.lsm yaps.doc
+	newdoc contrib/README README.contrib
+	insinto /usr/share/doc/${PF}/contrib
+	doins contrib/{m2y.pl,tap.sl}
+}
+
+pkg_postinst() {
+	elog
+	elog "Please edit /etc/yaps.rc to suit your needs."
+	elog
+}