Remove old and fix quoting.

Package-Manager: portage-2.1.4.4

9 files changed, 15 insertions, 322 deletions

diff --git a/net-im/ekg/ChangeLog b/net-im/ekg/ChangeLog
index fdd2f488c4a2..5e20d8a4a855 100644
--- a/net-im/ekg/ChangeLog
+++ b/net-im/ekg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/ekg
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ChangeLog,v 1.39 2007/10/11 19:26:05 pylon Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ChangeLog,v 1.40 2008/03/25 17:54:09 coldwind Exp $
+
+  25 Mar 2008; Santiago M. Mola <coldwind@gentoo.org>
+  -files/ekg-1.6-dragonfly.patch, -files/ekg-1.6_rc1-fpic.patch,
+  -ekg-1.6_rc3.ebuild, -ekg-1.6.ebuild, -ekg-1.7_rc2.ebuild,
+  -ekg-1.7_rc3.ebuild, ekg-1.7.ebuild:
+  Remove old and fix quoting.
 
   11 Oct 2007; Lars Weiler <pylon@gentoo.org> ekg-1.7.ebuild:
   stable ppc, bug #189735
diff --git a/net-im/ekg/Manifest b/net-im/ekg/Manifest
index 94b71ecb6104..328c13ea5709 100644
--- a/net-im/ekg/Manifest
+++ b/net-im/ekg/Manifest
@@ -1,16 +1,6 @@
-AUX ekg-1.6-dragonfly.patch 1223 RMD160 70fb85e06df80a5d0739e38c886a879c74067348 SHA1 41be21fbbe883b58e83e083130d9a9fa78a3eba5 SHA256 102bde3b50cb940ff10d390d18db147aa736df8570c6a92b592bce5930eee6f5
-AUX ekg-1.6_rc1-fpic.patch 487 RMD160 75827075db4f75270eea12f47124b39bd6bc1238 SHA1 e9c889cb91905a9f06788793aaebecd2fee0b8b6 SHA256 fec8d6ea43636d9ef64fa70392b16ade4004a66217516bd54264dcbd75e91cb1
 AUX ekg-1.6_rc3-libgadu.patch 833 RMD160 eb8bce6b255812dbb06d462d0ca6e8bab3522b1b SHA1 b10dcafd6af358d6f5d031cc755b3eb381cc457b SHA256 9bd6f9bf03ca1586a12c7324289950c7b0a5cf16573de48f8962682e12070e6a
 AUX ekg-1.7_rc2-giflib.patch 1281 RMD160 42e24852c2eda1253f17dc9cac16e9abb65b886b SHA1 58ac8b1253117b222cf6fdaa7d3590a3c736fd6a SHA256 eae41ce33f20ad2fe444d09bd0c331172369cf8ac93fb36422aa7bf1ca59dd46
-DIST ekg-1.6.tar.gz 503852 RMD160 6c601ceaf1b77c3c726a44b0712cd98b4d307fc4 SHA1 1b0cebd960c4aab1593a7ee6349bd57726ea1765 SHA256 c6dc601e20bb43c94f5689f05bca8e8501af4cff9dd760afdb3d6998c6952c28
-DIST ekg-1.6rc3.tar.gz 501596 RMD160 a9e249ca2c84fa2fe218dd965da0c8964ac14795 SHA1 0c67ec1e0331ca8213f43577562626997176abe5 SHA256 fc8a575d4600a41108633bfcba86e68d03902e3a7aff5b628abc8868e781b543
 DIST ekg-1.7.tar.gz 530314 RMD160 1832b34e5d8081fd8b04c85cd87be8cc07908b05 SHA1 3b02d2e9fff440783a202f343bda62dc6ad24815 SHA256 5fc42c8521c0e178f1b48d0b96578cbb5759202c6025ef9126c34af607897a2a
-DIST ekg-1.7rc2.tar.gz 514073 RMD160 bba2fa114e252aa088f86264eafd65d3e2bcca0a SHA1 e3f5b8fb6fa5762392871e608091c5fa0cb71b57 SHA256 17b42147dfe4ef8b7d901e285d68c490f7c645240c6934c23f0db82e61ace915
-DIST ekg-1.7rc3.tar.gz 523618 RMD160 95cbedce8b01916169e7c47473be2381fb456ac2 SHA1 b997ddf69e94456471b92691c3d4b2e4b3701ffe SHA256 ed09c8254feb275a3fe205297c019defc47a0770ccccd243a953b385913a8005
-EBUILD ekg-1.6.ebuild 1631 RMD160 b5d83065941b7382d1c9c2404e4e3d9628442301 SHA1 b8377b3bb9f633dc7095c466b9fc53e68d78ee84 SHA256 10a1ad5227e2440e2ad387ed804a08d4ca6aee1fa65247549c41e823cb29f247
-EBUILD ekg-1.6_rc3.ebuild 1556 RMD160 ac3fc920ec69255620270d32a88ee932912bcf89 SHA1 39afdf1a7ae081a9782b23192a53004e6bb5f7ec SHA256 737994b714302fd644d182b4d9ac16e1e30b047734c8d5541bd7d38d085b392d
-EBUILD ekg-1.7.ebuild 1672 RMD160 392741246eab1045f669381ac7bc0b7d56607ac6 SHA1 90e6411130f21ee5f991b7676a2a37e31d6e1a50 SHA256 534a7802496b30be0ea7d22ac6c5347b389f3170502d7fc8af9a68fbf5ab9ae8
-EBUILD ekg-1.7_rc2.ebuild 1668 RMD160 63a1af7e5c477cdf1185f659493872409846dc40 SHA1 b0604c1cd4e4de32250a72547a9fdffec0644545 SHA256 d10be2e932bfdc805dbb390ce9d0345f2e1eef721cd83e23fd3e127ea16aaea5
-EBUILD ekg-1.7_rc3.ebuild 1668 RMD160 789722fc53767243467c4c47d1c5070650779f24 SHA1 b9f8eb374eb576642aad3ecadaca2a12a04e6b3b SHA256 60fece90c6694ec84cb8aa4a4ceab83fcd44957aaa22cb1d2db008eb2a7c96d4
-MISC ChangeLog 5530 RMD160 6e4cbe2330c26f1a16f5337b5f3b4364b6564036 SHA1 b3a86541939213ddec84c9b85860032c5f40a36d SHA256 c344c94125881454086a6cef312f82998d34de25c2cf2b00f7b5d58598486b0b
+EBUILD ekg-1.7.ebuild 1681 RMD160 fac4bee167952a1dd489de7d9fc732de3ff35661 SHA1 6beed87fabd392701ef736ad1b9111cf5a562d82 SHA256 ba1cc6fc7e050c0699db032f71149f4e0cf0d47629526634ca1614f9986124f5
+MISC ChangeLog 5783 RMD160 f4505eca0a201573296ae758d17f5c872f80ac62 SHA1 cb3010ad921548fb654623da8bf8be1cc7521d7f SHA256 1890116fb141af253f52fa8cd460f39b61df0907a1b550c961b9614e3d9b8c6a
 MISC metadata.xml 252 RMD160 37333b41f65c0bb86b1e85296f5a38390ce16391 SHA1 703b268bdc76b083b71adc51ad11c15f96c86068 SHA256 af0e23920b67dbfbd701796b98ee6a0d538d6a4f0e7957e39abc25d2047932a4
diff --git a/net-im/ekg/ekg-1.6.ebuild b/net-im/ekg/ekg-1.6.ebuild
deleted file mode 100644
index 7345d7be7aac..000000000000
--- a/net-im/ekg/ekg-1.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ekg-1.6.ebuild,v 1.4 2006/10/23 19:14:53 spock Exp $
-
-inherit eutils
-
-IUSE="ssl ncurses readline zlib python spell threads"
-
-DESCRIPTION="EKG (Eksperymentalny Klient Gadu-Gadu) - a text client for Polish instant messaging system Gadu-Gadu"
-HOMEPAGE="http://ekg.chmurka.net/"
-SRC_URI="http://ekg.chmurka.net/${P/_/}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-
-S="${WORKDIR}/${P/_/}"
-
-RDEPEND="net-libs/libgadu
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	ncurses? ( sys-libs/ncurses )
-	readline? ( sys-libs/readline )
-	zlib? ( sys-libs/zlib )
-	python? ( dev-lang/python )
-	spell? ( >=app-text/aspell-0.50.3 )"
-
-DEPEND=">=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.50
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.6_rc3-libgadu.patch
-	epatch ${FILESDIR}/${PN}-1.6-dragonfly.patch
-	autoreconf
-}
-
-src_compile() {
-	local myconf="--enable-ioctld --disable-static --enable-dynamic"
-	if use ncurses; then
-		myconf="$myconf --enable-force-ncurses"
-	else
-		myconf="$myconf --disable-ui-ncurses"
-	fi
-	use readline	&& myconf="$myconf --enable-ui-readline"
-	use zlib	|| myconf="$myconf --disable-zlib"
-	use ssl		|| myconf="$myconf --disable-openssl"
-	use python	&& myconf="$myconf --with-python"
-	use spell	&& myconf="$myconf --enable-aspell"
-	use threads	&& myconf="$myconf --with-pthread"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc docs/* docs/api/*
-}
diff --git a/net-im/ekg/ekg-1.6_rc3.ebuild b/net-im/ekg/ekg-1.6_rc3.ebuild
deleted file mode 100644
index 29923a96aa4f..000000000000
--- a/net-im/ekg/ekg-1.6_rc3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ekg-1.6_rc3.ebuild,v 1.8 2006/10/23 19:14:53 spock Exp $
-
-inherit eutils
-
-IUSE="ssl ncurses readline zlib python spell threads"
-
-DESCRIPTION="EKG (Eksperymentalny Klient Gadu-Gadu) - a text client for Polish instant messaging system Gadu-Gadu"
-HOMEPAGE="http://ekg.chmurka.net/"
-SRC_URI="http://ekg.chmurka.net/${P/_/}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 hppa ia64 ~mips ppc ~sparc x86"
-
-S="${WORKDIR}/${P/_/}"
-
-RDEPEND="net-libs/libgadu
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	ncurses? ( sys-libs/ncurses )
-	readline? ( sys-libs/readline )
-	zlib? ( sys-libs/zlib )
-	python? ( dev-lang/python )
-	spell? ( >=app-text/aspell-0.50.3 )"
-
-DEPEND=">=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.50
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-libgadu.patch
-	autoreconf
-}
-
-src_compile() {
-	local myconf="--enable-ioctld --disable-static --enable-dynamic"
-	if use ncurses; then
-		myconf="$myconf --enable-force-ncurses"
-	else
-		myconf="$myconf --disable-ui-ncurses"
-	fi
-	use readline	&& myconf="$myconf --enable-ui-readline"
-	use zlib	|| myconf="$myconf --disable-zlib"
-	use ssl		|| myconf="$myconf --disable-openssl"
-	use python	&& myconf="$myconf --with-python"
-	use spell	&& myconf="$myconf --enable-aspell"
-	use threads	&& myconf="$myconf --with-pthread"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc docs/* docs/api/*
-}
diff --git a/net-im/ekg/ekg-1.7.ebuild b/net-im/ekg/ekg-1.7.ebuild
index b847a49564bc..941d9818395b 100644
--- a/net-im/ekg/ekg-1.7.ebuild
+++ b/net-im/ekg/ekg-1.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ekg-1.7.ebuild,v 1.6 2007/10/11 19:26:05 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ekg-1.7.ebuild,v 1.7 2008/03/25 17:54:09 coldwind Exp $
 
 inherit eutils autotools
 
@@ -32,9 +32,9 @@ DEPEND=">=sys-devel/automake-1.7
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.6_rc3-libgadu.patch
-	epatch ${FILESDIR}/${PN}-1.7_rc2-giflib.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.6_rc3-libgadu.patch
+	epatch "${FILESDIR}"/${PN}-1.7_rc2-giflib.patch
 	eautoreconf
 }
 
diff --git a/net-im/ekg/ekg-1.7_rc2.ebuild b/net-im/ekg/ekg-1.7_rc2.ebuild
deleted file mode 100644
index d85d4402cb6c..000000000000
--- a/net-im/ekg/ekg-1.7_rc2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ekg-1.7_rc2.ebuild,v 1.2 2006/10/23 19:14:53 spock Exp $
-
-inherit eutils autotools
-
-IUSE="ssl ncurses readline zlib python spell threads gif jpeg"
-
-DESCRIPTION="EKG (Eksperymentalny Klient Gadu-Gadu) - a text client for Polish instant messaging system Gadu-Gadu"
-HOMEPAGE="http://ekg.chmurka.net/"
-SRC_URI="http://ekg.chmurka.net/${P/_/}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-
-S="${WORKDIR}/${P/_/}"
-
-RDEPEND="net-libs/libgadu
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	ncurses? ( sys-libs/ncurses )
-	readline? ( sys-libs/readline )
-	zlib? ( sys-libs/zlib )
-	python? ( dev-lang/python )
-	spell? ( >=app-text/aspell-0.50.3 )
-	gif? ( media-libs/giflib )
-	jpeg? ( media-libs/jpeg )"
-
-DEPEND=">=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.50
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.6_rc3-libgadu.patch
-	epatch ${FILESDIR}/${PN}-1.7_rc2-giflib.patch
-	eautoreconf
-}
-
-src_compile() {
-	local myconf="--enable-ioctld --disable-static --enable-dynamic"
-	if use ncurses; then
-		myconf="$myconf --enable-force-ncurses"
-	else
-		myconf="$myconf --disable-ui-ncurses"
-	fi
-	use readline	&& myconf="$myconf --enable-ui-readline"
-
-	econf ${myconf} \
-		`use_with python` \
-		`use_with threads pthread` \
-		`use_with jpeg libjpeg` \
-		`use_with gif libgif` \
-		`use_enable zlib` \
-		`use_enable spell aspell` \
-		`use_enable ssl openssl` \
-	|| die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc docs/* docs/api/*
-}
diff --git a/net-im/ekg/ekg-1.7_rc3.ebuild b/net-im/ekg/ekg-1.7_rc3.ebuild
deleted file mode 100644
index 0957df8affd0..000000000000
--- a/net-im/ekg/ekg-1.7_rc3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ekg-1.7_rc3.ebuild,v 1.1 2007/03/17 12:00:25 spock Exp $
-
-inherit eutils autotools
-
-IUSE="ssl ncurses readline zlib python spell threads gif jpeg"
-
-DESCRIPTION="EKG (Eksperymentalny Klient Gadu-Gadu) - a text client for Polish instant messaging system Gadu-Gadu"
-HOMEPAGE="http://ekg.chmurka.net/"
-SRC_URI="http://ekg.chmurka.net/${P/_/}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-
-S="${WORKDIR}/${P/_/}"
-
-RDEPEND="net-libs/libgadu
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	ncurses? ( sys-libs/ncurses )
-	readline? ( sys-libs/readline )
-	zlib? ( sys-libs/zlib )
-	python? ( dev-lang/python )
-	spell? ( >=app-text/aspell-0.50.3 )
-	gif? ( media-libs/giflib )
-	jpeg? ( media-libs/jpeg )"
-
-DEPEND=">=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.50
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.6_rc3-libgadu.patch
-	epatch ${FILESDIR}/${PN}-1.7_rc2-giflib.patch
-	eautoreconf
-}
-
-src_compile() {
-	local myconf="--enable-ioctld --disable-static --enable-dynamic"
-	if use ncurses; then
-		myconf="$myconf --enable-force-ncurses"
-	else
-		myconf="$myconf --disable-ui-ncurses"
-	fi
-	use readline	&& myconf="$myconf --enable-ui-readline"
-
-	econf ${myconf} \
-		`use_with python` \
-		`use_with threads pthread` \
-		`use_with jpeg libjpeg` \
-		`use_with gif libgif` \
-		`use_enable zlib` \
-		`use_enable spell aspell` \
-		`use_enable ssl openssl` \
-	|| die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc docs/* docs/api/*
-}
diff --git a/net-im/ekg/files/ekg-1.6-dragonfly.patch b/net-im/ekg/files/ekg-1.6-dragonfly.patch
deleted file mode 100644
index 125ab74ede58..000000000000
--- a/net-im/ekg/files/ekg-1.6-dragonfly.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur ./ekg-1.6.orig/contrib/ioctld-client.c ekg-1.6/contrib/ioctld-client.c
---- ./ekg-1.6.orig/contrib/ioctld-client.c	2005-02-27 20:35:58 +0000
-+++ ekg-1.6/contrib/ioctld-client.c	2006-02-18 09:02:56 +0000
-@@ -26,7 +26,7 @@
- #include <arpa/inet.h>
- #include <sys/socket.h>
- #include <netdb.h>
--#ifdef __FreeBSD__
-+#if defined (__FreeBSD__) || defined (__DragonFly__)
- #  include <sys/kbio.h>			
- #endif
- #ifdef sun /* Solaris */
-@@ -147,7 +147,7 @@
- 		if (tone[s])
- 			fprintf(stderr, " %d/%d", tone[s], delay[s]);
- 
--#ifdef __FreeBSD__
-+#if defined (__FreeBSD__) || defined (__DragonFly__)
- 		ioctl(fd, KIOCSOUND, 0);
- #endif
- 
-diff -ur ./ekg-1.6.orig/src/ioctld.c ekg-1.6/src/ioctld.c
---- ./ekg-1.6.orig/src/ioctld.c	2005-02-27 20:36:02 +0000
-+++ ekg-1.6/src/ioctld.c	2006-02-18 09:03:46 +0000
-@@ -26,7 +26,7 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <sys/socket.h>
--#ifdef __FreeBSD__
-+#if defined (__FreeBSD__) || defined (__DragonFly__)
- #  include <sys/kbio.h>
- #endif
- #ifdef sun /* Solaris */
-@@ -124,7 +124,7 @@
- 		
- 	for (s = 0; tone[s] >= 0 && s < IOCTLD_MAX_ITEMS; s++) {
- 
--#ifdef __FreeBSD__
-+#if defined (__FreeBSD__) || defined (__DragonFly__)
- 		ioctl(fd, KIOCSOUND, 0);
- #endif
- 
diff --git a/net-im/ekg/files/ekg-1.6_rc1-fpic.patch b/net-im/ekg/files/ekg-1.6_rc1-fpic.patch
deleted file mode 100644
index ca2da2967c54..000000000000
--- a/net-im/ekg/files/ekg-1.6_rc1-fpic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur ekg-1.6rc1-old/configure ekg-1.6rc1/configure
---- ekg-1.6rc1-old/configure	2005-03-20 13:46:53.000000000 +0100
-+++ ekg-1.6rc1/configure	2005-04-14 13:15:30.294949464 +0200
-@@ -4224,7 +4224,7 @@
- echo $ECHO_N "checking if -pthread is sufficient with -shared... $ECHO_C" >&6
- 	save_CFLAGS="$CFLAGS"
- 	save_LIBS="$LIBS"
--	CFLAGS="-shared -Wl,-z,defs $CFLAGS"
-+	CFLAGS="-shared -fPIC -Wl,-z,defs $CFLAGS"
- 	ok="no"
-         cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"