Version bump with bugfixes, handle libproxy optional RDEPEND now that 0.4 is in the tree, disable pyc/pyo compiling (bug #233948 by Flameeyes), use 'emake' instead of plain 'make'. Remove old.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 46 insertions, 45 deletions

diff --git a/net-voip/telepathy-butterfly/ChangeLog b/net-voip/telepathy-butterfly/ChangeLog
index 61b032c3f84a..c98a69f5a28c 100644
--- a/net-voip/telepathy-butterfly/ChangeLog
+++ b/net-voip/telepathy-butterfly/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-voip/telepathy-butterfly
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/ChangeLog,v 1.26 2010/08/07 16:52:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/ChangeLog,v 1.27 2010/09/29 10:32:33 pacho Exp $
+
+*telepathy-butterfly-0.5.14 (29 Sep 2010)
+
+  29 Sep 2010; Pacho Ramos <pacho@gentoo.org>
+  -telepathy-butterfly-0.5.1.ebuild, +telepathy-butterfly-0.5.14.ebuild:
+  Version bump with bugfixes, handle libproxy optional RDEPEND now that 0.4
+  is in the tree, disable pyc/pyo compiling (bug #233948 by Flameeyes), use
+  'emake' instead of plain 'make'. Remove old.
 
   07 Aug 2010; Raúl Porcel <armin76@gentoo.org>
   telepathy-butterfly-0.5.9.ebuild:
diff --git a/net-voip/telepathy-butterfly/metadata.xml b/net-voip/telepathy-butterfly/metadata.xml
index d06378ef0d5f..da29265e68d5 100644
--- a/net-voip/telepathy-butterfly/metadata.xml
+++ b/net-voip/telepathy-butterfly/metadata.xml
@@ -4,4 +4,8 @@
   <herd>voip</herd>
   <longdescription lang="en">Telepathy connection manager for MSN network.
 </longdescription>
+<use>
+	<flag name='libproxy'>Automatically retrieve proxy settings via
+	<pkg>net-libs/libproxy</pkg></flag>
+</use>
 </pkgmetadata>
diff --git a/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.1.ebuild b/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.1.ebuild
deleted file mode 100644
index 2abddacc0c64..000000000000
--- a/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.1.ebuild,v 1.6 2010/07/08 15:03:23 arfrever Exp $
-
-PYTHON_DEPEND="2:2.5"
-
-inherit python multilib
-
-DESCRIPTION="An MSN connection manager for Telepathy"
-HOMEPAGE="http://telepathy.freedesktop.org/releases/telepathy-butterfly/"
-SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/telepathy-python-0.15.11
-	>=dev-python/papyon-0.4.2"
-
-DOCS="AUTHORS NEWS"
-
-src_compile() {
-	local myjobs=$(echo "$MAKEOPTS" | sed -n -e 's,.*\(-j[[:digit:]]\+\).*,\1,p')
-	./waf --prefix=/usr \
-		configure || die "./waf configure failed"
-	./waf ${myjobs} build || die "./waf configure failed"
-}
-
-src_install() {
-	./waf \
-		--destdir="${D}" \
-		install || die "./waf install failed"
-	rm -f $(find "${D}" -name *.py[co])
-	dodoc ${DOCS}
-}
-
-pkg_postinst() {
-	python_mod_optimize $(python_get_sitedir)/butterfly
-}
-
-pkg_postrm() {
-	python_mod_cleanup $(python_get_sitedir)/butterfly
-}
diff --git a/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.14.ebuild b/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.14.ebuild
new file mode 100644
index 000000000000..d73d0d12112c
--- /dev/null
+++ b/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.14.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.14.ebuild,v 1.1 2010/09/29 10:32:33 pacho Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2:2.5"
+
+inherit python multilib eutils
+
+DESCRIPTION="An MSN connection manager for Telepathy"
+HOMEPAGE="http://telepathy.freedesktop.org/releases/telepathy-butterfly/"
+SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+IUSE="libproxy"
+
+RDEPEND=">=dev-python/telepathy-python-0.15.17
+	>=dev-python/papyon-0.5.1
+	libproxy? ( >=net-libs/libproxy-0.3.1[python] )"
+
+DOCS="AUTHORS NEWS"
+
+src_prepare() {
+	# disable pyc compiling
+	mv py-compile py-compile-disabled
+	ln -s $(type -P true) py-compile
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+}