Version bump, bug 158399, fix pkgconfig dep, bug 153262, and drop old

(Portage version: 2.1.2-r9)

10 files changed, 53 insertions, 87 deletions

diff --git a/net-irc/ctrlproxy/ChangeLog b/net-irc/ctrlproxy/ChangeLog
index b6035af72031..902c1d5ecf6c 100644
--- a/net-irc/ctrlproxy/ChangeLog
+++ b/net-irc/ctrlproxy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/ctrlproxy
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ChangeLog,v 1.15 2006/09/08 22:37:42 agriffis Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ChangeLog,v 1.16 2007/02/17 14:51:09 armin76 Exp $
+
+*ctrlproxy-3.0.1 (17 Feb 2007)
+
+  17 Feb 2007; Raúl Porcel <armin76@gentoo.org> -ctrlproxy-2.6.ebuild,
+  ctrlproxy-2.6.1.ebuild, ctrlproxy-2.6.2.ebuild,
+  -ctrlproxy-3.0_alpha1.ebuild, +ctrlproxy-3.0.1.ebuild:
+  Version bump, bug 158399, fix pkgconfig dep, bug 153262, and drop old
 
 *ctrlproxy-3.0_alpha1 (08 Sep 2006)
 *ctrlproxy-2.6.2 (08 Sep 2006)
diff --git a/net-irc/ctrlproxy/ctrlproxy-2.6.1.ebuild b/net-irc/ctrlproxy/ctrlproxy-2.6.1.ebuild
index 6def9f7a89c5..7f370c87e894 100644
--- a/net-irc/ctrlproxy/ctrlproxy-2.6.1.ebuild
+++ b/net-irc/ctrlproxy/ctrlproxy-2.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ctrlproxy-2.6.1.ebuild,v 1.4 2006/09/08 22:37:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ctrlproxy-2.6.1.ebuild,v 1.5 2007/02/17 14:51:09 armin76 Exp $
 
 inherit flag-o-matic
 
@@ -18,6 +18,7 @@ DEPEND=">=dev-libs/glib-2
 	dev-libs/libxml2
 	dev-libs/tdb
 	dev-libs/libpcre
+	dev-util/pkgconfig
 	ssl? ( dev-libs/openssl )"
 
 src_compile() {
diff --git a/net-irc/ctrlproxy/ctrlproxy-2.6.2.ebuild b/net-irc/ctrlproxy/ctrlproxy-2.6.2.ebuild
index caa905af1c62..5cb21ef16321 100644
--- a/net-irc/ctrlproxy/ctrlproxy-2.6.2.ebuild
+++ b/net-irc/ctrlproxy/ctrlproxy-2.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ctrlproxy-2.6.2.ebuild,v 1.1 2006/09/08 22:37:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ctrlproxy-2.6.2.ebuild,v 1.2 2007/02/17 14:51:09 armin76 Exp $
 
 inherit flag-o-matic
 
@@ -18,6 +18,7 @@ DEPEND=">=dev-libs/glib-2
 	dev-libs/libxml2
 	dev-libs/tdb
 	dev-libs/libpcre
+	dev-util/pkgconfig
 	ssl? ( dev-libs/openssl )"
 
 src_compile() {
diff --git a/net-irc/ctrlproxy/ctrlproxy-2.6.ebuild b/net-irc/ctrlproxy/ctrlproxy-2.6.ebuild
deleted file mode 100644
index 9990762e1f7f..000000000000
--- a/net-irc/ctrlproxy/ctrlproxy-2.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ctrlproxy-2.6.ebuild,v 1.6 2006/09/08 22:37:42 agriffis Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="IRC proxy with multiserver and multiclient support"
-HOMEPAGE="http://ctrlproxy.vernstok.nl/"
-SRC_URI="http://ctrlproxy.vernstok.nl/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 alpha ~ppc"
-IUSE="ssl"
-
-DEPEND=">=dev-libs/glib-2
-	dev-libs/popt
-	dev-libs/libxml2
-	dev-libs/tdb
-	dev-libs/libpcre
-	ssl? ( dev-libs/openssl )"
-
-src_compile() {
-	use alpha && append-flags -fPIC
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make install \
-		DESTDIR=${D} \
-		man1dir=/usr/share/man/man1 \
-		man5dir=/usr/share/man/man5 || die
-	gzip ${D}/usr/share/doc/*/*
-	dodoc ctrlproxyrc.example
-}
diff --git a/net-irc/ctrlproxy/ctrlproxy-3.0.1.ebuild b/net-irc/ctrlproxy/ctrlproxy-3.0.1.ebuild
new file mode 100644
index 000000000000..9243d039a8ee
--- /dev/null
+++ b/net-irc/ctrlproxy/ctrlproxy-3.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ctrlproxy-3.0.1.ebuild,v 1.1 2007/02/17 14:51:09 armin76 Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="IRC proxy with multiserver and multiclient support"
+HOMEPAGE="http://ctrlproxy.vernstok.nl/"
+SRC_URI="http://ctrlproxy.vernstok.nl/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~ia64 ~ppc ~x86"
+IUSE="ssl"
+
+DEPEND=">=dev-libs/glib-2
+	dev-libs/popt
+	dev-libs/libxml2
+	dev-libs/libpcre
+	dev-util/pkgconfig
+	ssl? ( net-libs/gnutls )"
+
+src_compile() {
+	# hack alert
+	append-flags -fPIC
+
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+}
diff --git a/net-irc/ctrlproxy/ctrlproxy-3.0_alpha1.ebuild b/net-irc/ctrlproxy/ctrlproxy-3.0_alpha1.ebuild
deleted file mode 100644
index 22c9bceefe7b..000000000000
--- a/net-irc/ctrlproxy/ctrlproxy-3.0_alpha1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ctrlproxy-3.0_alpha1.ebuild,v 1.1 2006/09/08 22:37:42 agriffis Exp $
-
-inherit flag-o-matic
-
-MY_P=${P/_/}
-DESCRIPTION="IRC proxy with multiserver and multiclient support"
-HOMEPAGE="http://ctrlproxy.vernstok.nl/"
-SRC_URI="http://jelmer.vernstok.nl/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc ~ia64"
-IUSE="ssl doc"
-
-DEPEND=">=dev-libs/glib-2
-	dev-libs/popt
-	dev-libs/libxml2
-	dev-libs/tdb
-	dev-libs/libpcre
-	ssl? ( dev-libs/openssl )"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	# hack alert
-	append-flags -fPIC
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make install \
-		DESTDIR=${D} \
-		man1dir=/usr/share/man/man1 \
-		man5dir=/usr/share/man/man5 \
-		docdir=/usr/share/doc/${P} || die
-	gzip ${D}/usr/share/doc/${P}/*
-	dodoc ctrlproxyrc.example
-}
diff --git a/net-irc/ctrlproxy/files/digest-ctrlproxy-2.6 b/net-irc/ctrlproxy/files/digest-ctrlproxy-2.6
deleted file mode 100644
index c7129880cf49..000000000000
--- a/net-irc/ctrlproxy/files/digest-ctrlproxy-2.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f4d242cad2175f1626bb1d5558a8326a ctrlproxy-2.6.tar.gz 409600
diff --git a/net-irc/ctrlproxy/files/digest-ctrlproxy-2.6.1 b/net-irc/ctrlproxy/files/digest-ctrlproxy-2.6.1
index e9204bcf657d..b7ca856ff336 100644
--- a/net-irc/ctrlproxy/files/digest-ctrlproxy-2.6.1
+++ b/net-irc/ctrlproxy/files/digest-ctrlproxy-2.6.1
@@ -1 +1,3 @@
 MD5 07e802ab99309ecce7ad3b87b16399fb ctrlproxy-2.6.1.tar.gz 409600
+RMD160 fb0bae799ad0c12e127ceba57bf071f3c2202590 ctrlproxy-2.6.1.tar.gz 409600
+SHA256 3c166a2d6406236229ef0562be8d92fc5a99e8b9fe657e93a08e53ec9e2d5dc2 ctrlproxy-2.6.1.tar.gz 409600
diff --git a/net-irc/ctrlproxy/files/digest-ctrlproxy-3.0.1 b/net-irc/ctrlproxy/files/digest-ctrlproxy-3.0.1
new file mode 100644
index 000000000000..9b0b50e7e516
--- /dev/null
+++ b/net-irc/ctrlproxy/files/digest-ctrlproxy-3.0.1
@@ -0,0 +1,3 @@
+MD5 060a264fd698a83afa13ca1a2c932a11 ctrlproxy-3.0.1.tar.gz 203873
+RMD160 538a3a476dc2a4825af8e6ad67406a23cde2779e ctrlproxy-3.0.1.tar.gz 203873
+SHA256 0ae5e06f2ca459550013b4bdfb4297dc7788e923a60660fc12b86726485856e2 ctrlproxy-3.0.1.tar.gz 203873
diff --git a/net-irc/ctrlproxy/files/digest-ctrlproxy-3.0_alpha1 b/net-irc/ctrlproxy/files/digest-ctrlproxy-3.0_alpha1
deleted file mode 100644
index 72b005352dee..000000000000
--- a/net-irc/ctrlproxy/files/digest-ctrlproxy-3.0_alpha1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 307252f76b52f947fc61f21fc090dc9d ctrlproxy-3.0alpha1.tar.gz 173105
-RMD160 c31d5c03aab91495521749b4761569f9ba640657 ctrlproxy-3.0alpha1.tar.gz 173105
-SHA256 3e82e2f8ec361320a889a37f53b891d925947c04bd4365400c0ab6ce1c8ad4fc ctrlproxy-3.0alpha1.tar.gz 173105