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.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 60 insertions, 49 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/Manifest b/net-voip/telepathy-butterfly/Manifest
index 7ed3e49bc28a..8b28c273e122 100644
--- a/net-voip/telepathy-butterfly/Manifest
+++ b/net-voip/telepathy-butterfly/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX telepathy-butterfly-0.5.9-Disable-libproxy-support.patch 1673 RMD160 6924481831167403462244a9d78126838693b140 SHA1 196b460663bd7424d26fffb3748641028c199fba SHA256 29d28099ecf12e8f6e5182778284d0d02c962259711447c533b3d31825583b04
-DIST telepathy-butterfly-0.5.1.tar.gz 295717 RMD160 e8c3787d834d745dd85b3186185161fcb5d01c45 SHA1 1968bb494863352a2f293bb9570d64dc4ec33ddf SHA256 5c34165a2725bae24a4c6e496d34b42d927d732c6a152283661796e2c98fdbee
+DIST telepathy-butterfly-0.5.14.tar.gz 161312 RMD160 2e955ea7de870ff61da56c93c9c54f25b61ad94c SHA1 b3efa9596aad8858f4f87f3fe42d167e9a18db9e SHA256 dd38b5b3a8fb0305a9b4cf924132cd65f5463e4b28d470ebafaecffa8c213b9f
 DIST telepathy-butterfly-0.5.9.tar.gz 147491 RMD160 90ffd9a31ca7297e6684946d620253c4fcc7206c SHA1 95427d658a9ca2e3aae894fbdf9121d4efe09743 SHA256 add3d4d298e763175133e2632b99745b2974502587499ec88fde9d139343f136
-EBUILD telepathy-butterfly-0.5.1.ebuild 1182 RMD160 6dd3282a1e4de36ffacd4aef6d3224e50c93b7c3 SHA1 ffee6240b17813de56a9d7a71d99522e3246a654 SHA256 339474221ec3a885d8eff9d92d7c544eec2f235e31404905e39f238be7759ff0
+EBUILD telepathy-butterfly-0.5.14.ebuild 906 RMD160 47a8ac7fafa04aecefa58a5af14178757b95ef39 SHA1 0996cd0bdb624b3803119017494d29aea4b45469 SHA256 641378eaae64208d28d09a8cced8986b0dbb4f8f85f7747370e499c12b437e47
 EBUILD telepathy-butterfly-0.5.9.ebuild 1063 RMD160 d4ad71331179310c4a16a41a1f8105ce8f1e1889 SHA1 3ece17700f7457cf57fc53624e893e2dc93a5ccd SHA256 a3f2cfe3cf80a04b510e0003327685e9ff88a29c77a294ec767012a11789e8d1
-MISC ChangeLog 3871 RMD160 d89730d501209a2259a90ea74c7d2ba9c9c0aaf0 SHA1 03268c1d2958b6df8901eb61ccc9073975b3b7e3 SHA256 9cf0905e8b192f3b5cb45ba482838cb87bee20b72e949f5fd6e0b7a58c069b62
-MISC metadata.xml 253 RMD160 1545f8f08ff6a7cd2c36dbd87c80ccbfe6e222de SHA1 e30d4d9da9b0aeddadfef82930e8dfcb3c1ae6b5 SHA256 634a98614568bd5cc5f8ee82a405c9acd754248e9f234344d4b62830f42ba1a9
+MISC ChangeLog 4231 RMD160 443aed81c3bfbf2e15be2abc6bf63b3e453d50c3 SHA1 b9de1221a289fb7061579afb5c2a41bd239d30f8 SHA256 a418721048e7e01bcc7c4af7fedfa19369fb9ac2be97dd6cce20858fdaa4d0ba
+MISC metadata.xml 368 RMD160 6161aa08276cda4458d7618cf69c1f8f2983f521 SHA1 551cf40263cab87ab4039ce02eb3596bb4f860b4 SHA256 c68b74681f9d7c337e06b63309bb54215bed8ac4abd689b5f586536a77ce5aba
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyjFckACgkQCaWpQKGI+9QDxACfVcrK035vqDkjnXoufQMD5uTP
+SXUAoIVBZhtP87D6A1vDguEjw60PNZJf
+=EEwv
+-----END PGP SIGNATURE-----
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}"
+}