I'll co-maintain bti with Greg from now on, so cleanup older versions, leave the last one without liboauth, and add the new one that needs liboauth.

(Portage version: 2.2_rc69/cvs/Linux x86_64)

10 files changed, 88 insertions, 150 deletions

diff --git a/net-misc/bti/ChangeLog b/net-misc/bti/ChangeLog
index 73cb67c6f1fd..13273e34c31a 100644
--- a/net-misc/bti/ChangeLog
+++ b/net-misc/bti/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/bti
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bti/ChangeLog,v 1.13 2010/08/10 14:51:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bti/ChangeLog,v 1.14 2010/08/27 20:00:48 flameeyes Exp $
+
+*bti-027 (27 Aug 2010)
+
+  27 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org> -bti-013.ebuild,
+  -bti-014.ebuild, -bti-015.ebuild, -bti-020.ebuild, -bti-024.ebuild,
+  -bti-025.ebuild, +bti-027.ebuild, +files/bti-027-build.patch,
+  metadata.xml:
+  I'll co-maintain bti with Greg from now on, so cleanup older versions,
+  leave the last one without liboauth, and add the new one that needs
+  liboauth.
 
 *bti-026 (10 Aug 2010)
 
diff --git a/net-misc/bti/bti-013.ebuild b/net-misc/bti/bti-013.ebuild
deleted file mode 100644
index 4df707aa70f4..000000000000
--- a/net-misc/bti/bti-013.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bti/bti-013.ebuild,v 1.1 2009/02/04 18:22:16 gregkh Exp $
-
-inherit bash-completion
-
-DESCRIPTION="A command line twitter/identi.ca client"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/gregkh/bti/"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/people/gregkh/bti/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/curl sys-libs/readline"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	doman bti.1 || die "bti.1 could not be installed"
-	dobin bti || die "bti could not be installed"
-	dodoc bti.example README RELEASE-NOTES ||
-		die "bti documentation could not be installed"
-	dobashcompletion bti-bashcompletion
-}
diff --git a/net-misc/bti/bti-014.ebuild b/net-misc/bti/bti-014.ebuild
deleted file mode 100644
index a230bbe5de43..000000000000
--- a/net-misc/bti/bti-014.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bti/bti-014.ebuild,v 1.1 2009/02/14 06:48:46 gregkh Exp $
-
-inherit bash-completion
-
-DESCRIPTION="A command line twitter/identi.ca client"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/gregkh/bti/"
-SRC_URI="mirror://kernel/linux/kernel/people/gregkh/bti/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/curl sys-libs/readline"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	doman bti.1 || die "bti.1 could not be installed"
-	dobin bti || die "bti could not be installed"
-	dodoc bti.example README RELEASE-NOTES ||
-		die "bti documentation could not be installed"
-	dobashcompletion bti-bashcompletion
-}
diff --git a/net-misc/bti/bti-015.ebuild b/net-misc/bti/bti-015.ebuild
deleted file mode 100644
index cd2aa411a3b9..000000000000
--- a/net-misc/bti/bti-015.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bti/bti-015.ebuild,v 1.1 2009/03/11 20:23:01 gregkh Exp $
-
-inherit bash-completion
-
-DESCRIPTION="A command line twitter/identi.ca client"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/gregkh/bti/"
-SRC_URI="mirror://kernel/linux/kernel/people/gregkh/bti/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/curl sys-libs/readline dev-libs/libxml2"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	doman bti.1 || die "bti.1 could not be installed"
-	dobin bti || die "bti could not be installed"
-	dodoc bti.example README RELEASE-NOTES ||
-		die "bti documentation could not be installed"
-	dobashcompletion bti-bashcompletion
-}
diff --git a/net-misc/bti/bti-020.ebuild b/net-misc/bti/bti-020.ebuild
deleted file mode 100644
index 24adf6cc755c..000000000000
--- a/net-misc/bti/bti-020.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bti/bti-020.ebuild,v 1.1 2009/04/14 04:18:38 gregkh Exp $
-
-inherit bash-completion
-
-DESCRIPTION="A command line twitter/identi.ca client"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/gregkh/bti/"
-SRC_URI="mirror://kernel/linux/kernel/people/gregkh/bti/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/curl sys-libs/readline dev-libs/libxml2 dev-libs/libpcre"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	einstall || die "bti could not be installed"
-	dobin bti-shrink-urls || die "bti could not be installed"
-	dodoc bti.example README RELEASE-NOTES ||
-		die "bti documentation could not be installed"
-	dobashcompletion bti-bashcompletion
-}
diff --git a/net-misc/bti/bti-024.ebuild b/net-misc/bti/bti-024.ebuild
deleted file mode 100644
index 3341dd9f8a8e..000000000000
--- a/net-misc/bti/bti-024.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bti/bti-024.ebuild,v 1.1 2009/12/05 13:03:12 flameeyes Exp $
-
-inherit bash-completion
-
-DESCRIPTION="A command line twitter/identi.ca client"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/gregkh/bti/"
-SRC_URI="mirror://kernel/linux/kernel/people/gregkh/bti/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/curl sys-libs/readline dev-libs/libxml2 dev-libs/libpcre"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	einstall || die "bti could not be installed"
-	dobin bti-shrink-urls || die "bti could not be installed"
-	dodoc bti.example README RELEASE-NOTES ||
-		die "bti documentation could not be installed"
-	dobashcompletion bti-bashcompletion
-}
diff --git a/net-misc/bti/bti-025.ebuild b/net-misc/bti/bti-025.ebuild
deleted file mode 100644
index e7baa345ce57..000000000000
--- a/net-misc/bti/bti-025.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bti/bti-025.ebuild,v 1.1 2010/01/09 23:40:31 gregkh Exp $
-
-inherit bash-completion
-
-DESCRIPTION="A command line twitter/identi.ca client"
-HOMEPAGE="http://gregkh.github.com/bti/"
-SRC_URI="mirror://kernel/software/web/bti/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-misc/curl dev-libs/libxml2 dev-libs/libpcre"
-RDEPEND="sys-libs/readline"
-
-src_install() {
-	einstall || die "bti could not be installed"
-	dobin bti-shrink-urls || die "bti could not be installed"
-	dodoc bti.example README RELEASE-NOTES ||
-		die "bti documentation could not be installed"
-	dobashcompletion bti-bashcompletion
-}
diff --git a/net-misc/bti/bti-027.ebuild b/net-misc/bti/bti-027.ebuild
new file mode 100644
index 000000000000..6e9566d62f1b
--- /dev/null
+++ b/net-misc/bti/bti-027.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bti/bti-027.ebuild,v 1.1 2010/08/27 20:00:48 flameeyes Exp $
+
+EAPI=2
+
+inherit bash-completion eutils autotools
+
+DESCRIPTION="A command line twitter/identi.ca client"
+HOMEPAGE="http://gregkh.github.com/bti/"
+SRC_URI="mirror://kernel/software/web/bti/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND="net-misc/curl
+	dev-libs/libxml2
+	dev-libs/libpcre
+	net-libs/liboauth"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+# Readline is dynamically loaded, for whatever reason, and can use
+# libedit as an alternative...
+RDEPEND="${RDEPEND}
+	|| ( sys-libs/readline dev-libs/libedit )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "bti could not be installed"
+	dodoc bti.example README RELEASE-NOTES ||
+		die "bti documentation could not be installed"
+	dobashcompletion bti-bashcompletion
+}
diff --git a/net-misc/bti/files/bti-027-build.patch b/net-misc/bti/files/bti-027-build.patch
new file mode 100644
index 000000000000..d5dbaedf99c1
--- /dev/null
+++ b/net-misc/bti/files/bti-027-build.patch
@@ -0,0 +1,21 @@
+Index: bti-027/Makefile.am
+===================================================================
+--- bti-027.orig/Makefile.am
++++ bti-027/Makefile.am
+@@ -7,14 +7,14 @@ bin_SCRIPTS = \
+ bti_SOURCES = \
+ 	bti.c
+ 
+-bti_CPPFLAGS =
++bti_CPPFLAGS = \
+ 	$(LIBCURL_CPPFLAGS) \
+ 	$(XML_CPPFLAGS) \
+ 	$(LIBPCRE_CPPFLAGS) \
+ 	$(LIBOAUTH_CPPFLAGS)
+ 
+ bti_LDADD = \
+-	$(LIBCURL_LIBS) \
++	$(LIBCURL) \
+ 	$(XML_LIBS) \
+ 	$(LIBPCRE_LIBS) \
+ 	$(LIBOAUTH_LIBS)
diff --git a/net-misc/bti/metadata.xml b/net-misc/bti/metadata.xml
index 7468e5f984c3..c710b943995d 100644
--- a/net-misc/bti/metadata.xml
+++ b/net-misc/bti/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-	<email>gregkh@gentoo.org</email>
-	<name>Greg Kroah-Hartman</name>
-</maintainer>
+  <herd>no-herd</herd>
+  <maintainer>
+    <email>gregkh@gentoo.org</email>
+    <name>Greg Kroah-Hartman</name>
+  </maintainer>
+  <maintainer>
+    <email>flameeyes@gentoo.org</email>
+    <name>Diego Elio Pettenò</name>
+  </maintainer>
 </pkgmetadata>