Clean up old. Update HOMEPAGE in the remaining ebuilds.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

8 files changed, 28 insertions, 563 deletions

diff --git a/net-wireless/blueman/ChangeLog b/net-wireless/blueman/ChangeLog
index 0f7cc46863c9..88bbfb22a3e9 100644
--- a/net-wireless/blueman/ChangeLog
+++ b/net-wireless/blueman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/blueman
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.37 2015/08/08 15:35:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.38 2015/08/08 15:42:23 mgorny Exp $
+
+  08 Aug 2015; Michał Górny <mgorny@gentoo.org> -blueman-1.23-r1.ebuild,
+  -blueman-1.23.ebuild, -blueman-1.23_p20140717-r1.ebuild,
+  -files/blueman-1.23_p20140717-set-codeset-for-gettext-to-UTF-8-always.patch,
+  blueman-1.23-r2.ebuild, blueman-1.98_p20150105.ebuild:
+  Clean up old. Update HOMEPAGE in the remaining ebuilds.
 
 *blueman-2.0 (08 Aug 2015)
 
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 8c4bfecf5aba..f461604aad74 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -4,39 +4,34 @@ Hash: SHA256
 AUX blueman-1.23-fix-broken-status-icon.patch 1174 SHA256 b6fe3d426d90e2d212a005aaa7bae2f800bb69df407aa90058f7b1029ba7c296 SHA512 7afae388631e8899f32d1e8bbb313ecd3333103a6b2640c0bd200122b4707b6393f8cb40a3d0b13d3293ed14fc64e7206276a9cac4ed932464cced1cb03f1b64 WHIRLPOOL 86ad052cff290eb1f00e04d8ef5aa087e463a82daf327e9fe7ac368d111430b172b2ad00c048be50e64640275ed1984b61d0d68781daf4198a018fccbe17ae3e
 AUX blueman-1.23-plugins-conf-file.patch 988 SHA256 58132546cf913af396d189503e7e3aee53d6e626486343757169b6f0ec34d913 SHA512 3016a3a9c29fe65b7482091571f8aa6b49f21ea72181a9c7e559943347957c7554a72df4022c43d41ee4f4a10be82a011a9f1918191616acee8587fb0aa3a00a WHIRLPOOL d649ec459310b108eec4f95c68647f53454a4a69aa7ab24baf262c79e1398cc9be593f59e9b61cc7e56afd1175c2c8aa181db7e13a53b25589a2be5b725b0b11
 AUX blueman-1.23-set-codeset-for-gettext-to-UTF-8-always.patch 9343 SHA256 6d2cd72f41fc054f023dfeb894bb4049441fc01e6e0f936120603021c305bbcc SHA512 0f264599331b518ce5c6573324fffad9b202b66c993284d907db38b6736a25f3d62d38973ac78adb542381bd0c8d09d710612ba0f373f0ba9153d70fbacb6302 WHIRLPOOL 1e29293f77b919cad790e43391231bee07304d938d44b981a67fd806a392547c8b1c426debf881a0cebb9c0df37e4d43bd97ef237ca76a5d23613e05b20a9096
-AUX blueman-1.23_p20140717-set-codeset-for-gettext-to-UTF-8-always.patch 8717 SHA256 91f6351614a8bdbb51155399f77c384a86407deb609c9e7bb61ffac17a56d81d SHA512 524afc7729564b5355f38648840b783426cf5aeaffd1bf157f725100b780d35b7524bc81144d3453e34683ea9f7af6982176d45b4488c8176c10224f74452f4d WHIRLPOOL ed053972b26a018276c221a51893bc0b1ab7b2b15e3900905444cfce03a41dd5eade845cd3e4ce3511ebf724e5a1c4e9dbd1f5024518ad8834fa2779bd1253a1
 AUX blueman-1.98_p20150105-set-codeset-for-gettext-to-UTF-8-always.patch 8655 SHA256 f6acf4c846d3ccc1168a9dbc7fb31ecebae7488e544cc9778ec15ec5b468d23d SHA512 7d3834476d3a82e05853404733b26408fad76a6a4fa809f7f4eeb2de48fca7820a98fd28022d5e92b401c4c80ff1ea2992b97550172ac4dc4b433a840d32d355 WHIRLPOOL be7a9785a7a80b00f5966423585ace349effbc75a7ed8e77ce251809b5c3a9cae33636274e78175ce9051e4af30c32aca8f29499a7eed32dfb69336568e678fe
 AUX blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch 8113 SHA256 42e18bc6e5e1562a1773c22c8935cf054a9583918691cfc5c560749440333735 SHA512 81ec04a7b4ea0cd71e94ba2f5bdd36354e7958a42a5386faccb7e1b9c743edc7f218e2f1110eaeaae85a327dc451f335b284444f43d20cad25b69b661bf9494f WHIRLPOOL 3f919130553144e779f111c0902c1b2460a474f73e4b6a53e973cac540652a557143f0b8a4af6a8e0848e4eec546bda168d809f84e42ad822668641821239f7a
 AUX blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch 10085 SHA256 dd1189f5d0f38ee2db43f0281f62c18772f7992bfa833d8778190050ebac75ac SHA512 b8fffff0887efef5d5e3e1fbc475a94c3b90a0b35b7466ab728edc428f262d9806b22c938b4365db5e6d35ba1f326b53beea4d2a726e2e037497ef5083ea80ca WHIRLPOOL cbed09b5ae3ebffec1b88ff70cf21ccc6c66347c1bccf037507aa7c69724a263c657e7d35fe0168ec193be35843b502e0d644df09eb964411ef6c10459cd4da1
 DIST blueman-1.23.tar.gz 1223094 SHA256 50b261bcdc2e99e176c7c194825da1259500aaacaccb92714d97af0209a4f011 SHA512 529a43dace73bf362baac69404a9e87d14f5bcb7b07b18194434c7a6c1dbc22f8fecdb4923c92a77b65656405a492b9e147e77cb7a161df4a93e8b78a003eba7 WHIRLPOOL 4070b4d86cbe743278730e4ee3022bcfdea590b5b76e545cc67912a3498de993ed0c62cb67ac2cd3ad3b8e3c17c5d5a8b1f8fa6e214234a64a784146c6d6d542
-DIST blueman-1.23_p20140717.tar.xz 1679284 SHA256 3b4bbd68e6613299b7577e6a73a9efb86fa1ee2b033e0eb5849e6acd61135fc9 SHA512 ce279aaa7ed85dedc1329534c99f0d660c00c1b887efb543f7b62217bc329c03d400f60847e01b1a25ea4dbbad8f67077b865ac484d88e0e00a4791dcd8c4156 WHIRLPOOL f1b01633062c6a779be6755e039065d7a3ebefefc26025ddc28156968ea1b39c7509ee05f077d574786293d999d586bd2e0ca1eb18da05cf3593b06b28110cc9
 DIST blueman-1.98_p20150105.tar.xz 1698524 SHA256 cb610b0c4799d87989a2f6147059fb850f71984909f761af875c3106f51d543a SHA512 c988ff6cf9769d7653be252bda59bb41388a4d41d7b1f5aa01df63278018fc637634ea96a08b183b78cb5b966c3d2dc189021f437eabf674e8f93812798d4a6b WHIRLPOOL 7070a1bff973fe682af3b0103c99424401e5c3c5bc5632aefbaa9b5c9835d3f001b0656a17893feaffdcc3bfe173aac0c17789b634f937c54906774c9acde22f
 DIST blueman-2.0.tar.xz 1941332 SHA256 81a5ca95124f12bfb62d2d2d0d265af70cdae1d43b0c6e4fc6d2bad8f82958f1 SHA512 44d3967d031f7482e7700674970eff08fee53d8cbeb96e46b2f97e2a2fb6b5790f663ed73129eab241545ebaa6c5748dc6cf6b90a2c4795b27e90b5399d71f80 WHIRLPOOL 394bac3e0b457fdbb79c69fe9181abafde3f9b1138ff71c4dc23bc78424b76284e3ad9cf02dc168848fa461541f86fa2bba5aee0f014e460f0852e1bfa163dae
-EBUILD blueman-1.23-r1.ebuild 2394 SHA256 4ba9035e3c2b315e3edf3909390f1c8e5d45f77e5e67b0fc8eca1389fc62b4b0 SHA512 c0cbbc30c52d5fc8f905fe49ab6c8fe29e621703c7fd1c69fbaf64a84c196f7df0d378ee389413580fed16c7014541bea3ef36dfbb927a11d76dcc6675136bb1 WHIRLPOOL 699fdd123d93fe109f83c07e066c3e157d45f06e286fec81145702bac7dbe0192a4d9c12a650d9bbba7d5bec07658c3cd63f664b1198f3bae59fa6c0af3c2e29
-EBUILD blueman-1.23-r2.ebuild 2488 SHA256 99a27d58912568511a4febbe41a48c507ee069bce3400692bfa4dd2e6d7c3377 SHA512 f2377a71c38ac477aac8715b886987d7a663694aefca42e06113ddbf94878050f55568e9cbfb81993478efe85bcd6616b72152fcb9a42a81cb1329d7a490de49 WHIRLPOOL 360c19c52fdcdb1e13282d96b6931f7c2b6b7f01d94e9c94dd958ce95a6125bba4af38361767cf368b34948d587950eccd4787ed6951c567a092387d93d35297
-EBUILD blueman-1.23.ebuild 2318 SHA256 0c1626d9ec3db5bc63a01e10999f6baf8c7720bb8ea59e5080954c2db06ac550 SHA512 8b8408c02798bccec24b2ce6ef5cfcd7fb37701c84c678a4269bd61d2d40df1c9da6840c9b35fea0998f4ffbc262d32bf77af43fd81295ebbaaff7289eefe40c WHIRLPOOL cfad818e6fb3bfffedcc49486a46868d0fd21bdab22a65311f66dc54da15df5f3861a0b359cfd1a4a5046f91372b3f77e6f15b7f7a6cc58c40491617f4757ca9
-EBUILD blueman-1.23_p20140717-r1.ebuild 2755 SHA256 df2106cca7a2cf993ee646d6490b532325217dd2cc42252e344da9ca2136c73a SHA512 5bcb3fba0666e8b22611d53223fcaab2b28484c7646f33f1a0659f62110fdb918c2363936dbd02d12aa4c5a8732a78a474bab1626fb919baaf1aed7159ec3118 WHIRLPOOL 7ce9ad57a3a35da6ab6c9dc21c09ddebdd0e3157215aed09d8f330c279ed4dd2ec111387efd4d76fc04a234d8c0b3c62e494668e80def17661fca8cdc922cb18
-EBUILD blueman-1.98_p20150105.ebuild 2822 SHA256 59afad2427b1d1f1d7ae86893827bd840e5a2103d3f23f5e116c25787e288f62 SHA512 71b39c0ecd2e05a0543174626fabbbcf109f4fbf20f9f88c92e92712a3ce910284d1fa1f40dcda13f7be6f96f730d1f155e13c804e28bcf010692c5734c3e5e1 WHIRLPOOL 1d4d0745b278040f3dd468faeb892ddc56da63fc5eb05dffbdbcf869bdff7d0669a6cc7ea771f27e5c5a3956fb0a3b69911d9af6cb14dffcbc93e8ba30dd6be2
+EBUILD blueman-1.23-r2.ebuild 2500 SHA256 d1bdf9e52681305cd3f89ebad0e7d2df55637c6a2374aecf95fc028eac7515a7 SHA512 d3aef2409eddea2dbcd95f5becae6e55e288c9faa143afed64b7b27d8bb9608c37ca706c3e253d898d38dda63706c63a85fd46c01c73c5ea91f9cfd1be3f3b70 WHIRLPOOL d8ca5b099e238f31ece314fcf1729b8b877720cbf94495f491ff37b8d078f6069a4e5a55b86c3196204a7ee393d3363dfd0334a3c79f21f15822a6e3a71707a7
+EBUILD blueman-1.98_p20150105.ebuild 2834 SHA256 d3fc1ac8481dfd0bfcc42a7b6c9455c46e9b4eca4b06166adffee291dba9ccc8 SHA512 3fbfe010c6c069bc798f643663961fbc7795fc8965a87a6ee6f01ad293e585a675ad413713a32391a101ad4471592db8599ddb94ab06301da810639b54a5d301 WHIRLPOOL 90fbe6656eb23deed46f80a71883f2531b19b254381e3e0fb4422ac709f37a7fe688a41fdcf11861d70d89da29dc9db182ab597f0d0b12db2374d731cdd54194
 EBUILD blueman-2.0.ebuild 2503 SHA256 ec3590e7eb3a9c5ba5c76cc92c540da23c40e23d82a2b9c6b90e912f7f0c9a9d SHA512 4caae331326acf82a497368951908e17abed2865d5fecc731b0c3bfef1d32836440fcb6f91a52e05ca893bbf4f71b130a56a81a862d14d6cb8a4e55ee62e4321 WHIRLPOOL fdef6648d15eb36c179db8f837046939bf64a33acb5be8217a57f0998de9652803e97b7a8edc211c5559de9f0773badfcef99f07f51616bdad01ae165d6d7843
 EBUILD blueman-9999.ebuild 2361 SHA256 8178af3f6c8f6d97a257033d1878017614982a34f3ca2dfaa5c07d7b048a0cb9 SHA512 67253742423fa4716a07104b5ffb3135254949ff570f1525268d2223b962048dac8e7fea237687fba05e6108bcf13f61fed9fc8d0b2bf2b3d997d9e207870cea WHIRLPOOL 24db33c52deaf444b299c87cba726d96a1f4ba8c255dfe92cb682afe27597b5714d58d996aaef1231b6745c502c8c7bef73bd7310a05643223e35d9cf90392dd
-MISC ChangeLog 7470 SHA256 cdd0a8867a7b5ad0cfcde7dbbaa78b5e1f39efc9940b38ad0929b542f525bead SHA512 c88c836e98144597f95e878c4446ea337c1b34194a57377dee6dfb5d58a83a9c563b5a71c43c1dfadd6097ed880603393f17aad392c772a420e3627a0d25e806 WHIRLPOOL 2ee6ddb3ed4dbfc2cefb07f8237b15e380a9a1352ede255305d972f2e17562e2bfddab613d4190e0b6f7f9039a8a64c2d884761a7bfb2000c153ef3b6621bb40
+MISC ChangeLog 7799 SHA256 eabfec91ca1b911729363364067e5a846456e87dbacf3a2a969aae9f042a272a SHA512 34cf952b4afc9993bc37c2ee901577ba38562f41b223e3d4e66f8209531769a1c12a96f9b3c5c6968a58c1f77c69c29e0691374390b90ff1880a1f322525e833 WHIRLPOOL 6dac004f6621ca226084a224e1f44addedb76d34e2a909460a7fd7aac5259870be59f5a3354e024d6bc45ef9f4160835e91a62a828c1c25835cc3b195d0b7717
 MISC metadata.xml 905 SHA256 a09e159e540efe4f25a9ec03094e5df5f1e75c86554f9501b31aa87d5c7710cd SHA512 47c056ea98bb3910a3515cb766841d60509d914ecced9fc9059f8805d700a3607a9c46e0a483a2fee2a94bb8fcb426247557ed3609de36550fabc5d9e0ea98b2 WHIRLPOOL 76cfd935e45cb63afb6447836b6b84f8559cdc7723acce30358bb2f36379813858b5f010c9f2517b0b67a04c5fdbcb6474caccd96807900cfbaf8f389626ef63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVxiGoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVxiNhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOBZYQAJ05XO8rvRs71OZLSw6cvzZB
-SRnxoOk/oy4ZVzLlzHrmVABoKVpR35SgeCp2ohmdN4ffBqj2eELCTF4MA0ULJEg2
-uHJ/avI4xozcvb7tqu5QxHURoIXX3DolQwxRR9rmj9RuIuhsgBvTPsQi87le+j2i
-x3/Yc0WMwvNlp5FTL7ifOTYhjUitykUsy+x9RXh4alobKX/1Ggx+axvm3csPYRj6
-QDTLnad2GuJbKRQzGPFFy7TYZZjpa8fO8xCWDNln6j+c0HOm+nVQFCEoHIGTy36n
-59H0MC5iWlKKVFTqrmoVqgimHuMhjSvgVvYPB6N2rTg/cD4Tf7rAOK8a4p4WhJ6z
-hD2RwBcJPykAEEt4ht1lrUnya5U6wHDZc3M8rxSBz3EKHc8jwbwpTFhxCfCQk48Z
-az2DDFNiU0vFT/qKgj7By19J/fj6ofTxldC0yM836nB40XjShPku7QwjkZmukQzI
-j7kqXq86BiyjaHJux+Y4bmySsG1capqM/r4PeyR7TpPVXLvfZm1/IlxdpLo+cyLD
-ClK3AIxPFc/HwtbnwqqzV88U8XiPBwxwVxGegDX1eBA0KuP+60KLubHRU1aj1eiD
-p+kj+6NxkPicefns017CX5fPrvtvJQixZvIaPLV3rQv95JBGHuUkOQS7tCQUI4af
-BO7iAGkTkKLWdvYNNMr3
-=nUJp
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOz6QP/3t8LeBjZiZrHR8wsNWLtf1J
+7GPpp8CLwqg9y2Tdqo+yBViCTMNaaHiR4whtIxad+KElh7h2XNDj5fibeu4x3Iq8
+wCtEJjRjimR1u/TUx0SeieFd05H7z1DyYmwaffegHJ4K2ucxLt1QQhT6C3rRDJ6d
+MGe6LBVcD4Y4/eUnniZVuVoOBwe6TiT74NKBF5CHqFA5+KAHFZDFPiWJ1OIWjwl2
+zvvc9i4K9YD+gHkomrf+ATueAksMF8A1kjEiFns+IpJmMAfdj7lvYOnMGeYrOCm9
+n40kFJmyGKL0ecLrOJQKKuBJ+2x2+Kgx5GCSv8vOJvJOXjFWnXgkpXFhWYJOkpiB
+BUNOSaI/bT0/syHJcQaxFsNU9UtkT+W/+O7HvI0QMxe9WQQU3PXDyqMyOGoVAK6L
+iD1dFqrQjOiuDvtB3ljmWHHnPZHO3dsNVlvaqbFMfFhiAlkyqKosc0EH7a2dAVIe
+bEvmFTN1QlV+EV8xjjCIAGV85M+V9ggm+elYFKi1g08R2pIfv65yv1R5ETSPh1az
+WXEnE7E//JuMQ05jZLsDSDzij/LqIWf0iifGRqTqj7TZhHi2mfu9YhZwObQqAVVD
+zldbSVcHMKKv0QFlkbJvZjuvTRCztyc/0lmR2kVMWg4xcWGDo4IxauXVu5WSF3RD
+hDcSAhnfWtT8G8I3O8ZO
+=GpfY
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/blueman/blueman-1.23-r1.ebuild b/net-wireless/blueman/blueman-1.23-r1.ebuild
deleted file mode 100644
index 68aac986a40f..000000000000
--- a/net-wireless/blueman/blueman-1.23-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-1.23-r1.ebuild,v 1.5 2015/01/05 19:56:01 zerochaos Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2:2.7"
-
-inherit eutils python gnome2-utils
-
-DESCRIPTION="GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks"
-HOMEPAGE="http://blueman-project.org/"
-SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gconf sendto network nls policykit pulseaudio"
-
-CDEPEND="dev-libs/glib:2
-	>=x11-libs/gtk+-2.12:2
-	x11-libs/startup-notification
-	dev-python/pygobject:2
-	<net-wireless/bluez-5
-	>=net-wireless/bluez-4.21"
-DEPEND="${CDEPEND}
-	nls? ( dev-util/intltool sys-devel/gettext )
-	virtual/pkgconfig
-	>=dev-python/pyrex-0.9.8"
-RDEPEND="${CDEPEND}
-	>=app-mobilephone/obex-data-server-0.4.4
-	sys-apps/dbus
-	dev-python/pygtk
-	dev-python/notify-python
-	dev-python/dbus-python
-	x11-themes/hicolor-icon-theme
-	gconf? ( dev-python/gconf-python )
-	sendto? ( gnome-base/nautilus )
-	network? ( || ( net-dns/dnsmasq
-		net-misc/dhcp
-		>=net-misc/networkmanager-0.8 ) )
-	policykit? ( sys-auth/polkit )
-	pulseaudio? ( media-sound/pulseaudio )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# disable pyc compiling
-	ln -sf $(type -P true) py-compile
-
-	sed -i \
-		-e '/^Encoding/d' \
-		data/blueman-manager.desktop.in || die "sed failed"
-
-	epatch \
-		"${FILESDIR}/${P}-plugins-conf-file.patch" \
-		"${FILESDIR}/${P}-fix-broken-status-icon.patch" \
-		"${FILESDIR}/${P}-set-codeset-for-gettext-to-UTF-8-always.patch"
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable policykit polkit) \
-		$(use_enable sendto) \
-		--disable-hal \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	rm "${D}"/$(python_get_sitedir)/*.la
-	use sendto && rm "${D}"/usr/lib*/nautilus-sendto/plugins/*.la
-
-	use gconf || rm "${D}"/$(python_get_sitedir)/${PN}/plugins/config/Gconf.py
-	use policykit || rm -rf "${D}"/usr/share/polkit-1
-	use pulseaudio || rm "${D}"/$(python_get_sitedir)/${PN}/{main/Pulse*.py,plugins/applet/Pulse*.py}
-
-	python_need_rebuild
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-	gnome2_icon_cache_update
-}
diff --git a/net-wireless/blueman/blueman-1.23-r2.ebuild b/net-wireless/blueman/blueman-1.23-r2.ebuild
index f7102dfcbdcc..e62a810011cb 100644
--- a/net-wireless/blueman/blueman-1.23-r2.ebuild
+++ b/net-wireless/blueman/blueman-1.23-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-1.23-r2.ebuild,v 1.4 2015/01/05 19:56:01 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-1.23-r2.ebuild,v 1.5 2015/08/08 15:42:23 mgorny Exp $
 
 EAPI="4"
 
@@ -9,7 +9,7 @@ PYTHON_DEPEND="2:2.7"
 inherit eutils python gnome2-utils
 
 DESCRIPTION="GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks"
-HOMEPAGE="http://blueman-project.org/"
+HOMEPAGE="https://github.com/blueman-project/blueman"
 SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/net-wireless/blueman/blueman-1.23.ebuild b/net-wireless/blueman/blueman-1.23.ebuild
deleted file mode 100644
index a5d43d72c656..000000000000
--- a/net-wireless/blueman/blueman-1.23.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-1.23.ebuild,v 1.4 2015/01/05 19:56:01 zerochaos Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2"
-
-inherit eutils python gnome2-utils
-
-DESCRIPTION="GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks"
-HOMEPAGE="http://blueman-project.org/"
-SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gconf sendto network nls policykit pulseaudio"
-
-CDEPEND="dev-libs/glib:2
-	>=x11-libs/gtk+-2.12:2
-	x11-libs/startup-notification
-	dev-python/pygobject:2
-	<net-wireless/bluez-5
-	>=net-wireless/bluez-4.21"
-DEPEND="${CDEPEND}
-	nls? ( dev-util/intltool sys-devel/gettext )
-	virtual/pkgconfig
-	>=dev-python/pyrex-0.9.8"
-RDEPEND="${CDEPEND}
-	>=app-mobilephone/obex-data-server-0.4.4
-	sys-apps/dbus
-	dev-python/pygtk
-	dev-python/notify-python
-	dev-python/dbus-python
-	x11-themes/hicolor-icon-theme
-	gconf? ( dev-python/gconf-python )
-	sendto? ( gnome-base/nautilus )
-	network? ( || ( net-dns/dnsmasq
-		net-misc/dhcp
-		>=net-misc/networkmanager-0.8 ) )
-	policykit? ( sys-auth/polkit )
-	pulseaudio? ( media-sound/pulseaudio )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# disable pyc compiling
-	ln -sf $(type -P true) py-compile
-
-	sed -i \
-		-e '/^Encoding/d' \
-		data/blueman-manager.desktop.in || die "sed failed"
-
-	epatch \
-		"${FILESDIR}/${P}-plugins-conf-file.patch" \
-		"${FILESDIR}/${P}-fix-broken-status-icon.patch"
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable policykit polkit) \
-		$(use_enable sendto) \
-		--disable-hal \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	rm "${D}"/$(python_get_sitedir)/*.la
-	use sendto && rm "${D}"/usr/lib*/nautilus-sendto/plugins/*.la
-
-	use gconf || rm "${D}"/$(python_get_sitedir)/${PN}/plugins/config/Gconf.py
-	use policykit || rm -rf "${D}"/usr/share/polkit-1
-	use pulseaudio || rm "${D}"/$(python_get_sitedir)/${PN}/{main/Pulse*.py,plugins/applet/Pulse*.py}
-
-	python_need_rebuild
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-	gnome2_icon_cache_update
-}
diff --git a/net-wireless/blueman/blueman-1.23_p20140717-r1.ebuild b/net-wireless/blueman/blueman-1.23_p20140717-r1.ebuild
deleted file mode 100644
index e0da51c6c6a0..000000000000
--- a/net-wireless/blueman/blueman-1.23_p20140717-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-1.23_p20140717-r1.ebuild,v 1.6 2015/01/05 19:56:01 zerochaos Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1 gnome2-utils autotools
-
-DESCRIPTION="GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks"
-HOMEPAGE="http://blueman-project.org/"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}-project/${PN}.git"
-	KEYWORDS=""
-else
-	#SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz"
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="gconf sendto network nls policykit pulseaudio"
-
-CDEPEND="dev-libs/glib:2=
-	x11-libs/gtk+:3=
-	x11-libs/startup-notification:=
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3
-	>=net-wireless/bluez-4.61:=
-	${PYTHON_DEPS}"
-DEPEND="${CDEPEND}
-	nls? ( dev-util/intltool sys-devel/gettext )
-	virtual/pkgconfig
-	dev-python/cython[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=app-mobilephone/obex-data-server-0.4.4
-	sys-apps/dbus
-	x11-themes/hicolor-icon-theme
-	gconf? ( dev-python/gconf-python[${PYTHON_USEDEP}] )
-	sendto? ( gnome-base/nautilus )
-	network? ( || ( net-dns/dnsmasq
-		net-misc/dhcp
-		>=net-misc/networkmanager-0.8 ) )
-	policykit? ( sys-auth/polkit )
-	pulseaudio? ( media-sound/pulseaudio )
-	!net-wireless/gnome-bluetooth
-	x11-themes/gnome-icon-theme
-"
-# See bug 455320 and https://github.com/blueman-project/blueman/issues/112 for reason for gnome-icon-theme dep
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	sed -i \
-		-e '/^Encoding/d' \
-		data/blueman-manager.desktop.in || die "sed failed"
-
-	epatch \
-		"${FILESDIR}/${PN}-9999-plugins-conf-file.patch" \
-		"${FILESDIR}/${P}-set-codeset-for-gettext-to-UTF-8-always.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable policykit polkit) \
-		$(use_enable sendto) \
-		--disable-hal \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	python_fix_shebang "${D}"
-
-	rm "${D}"/$(python_get_sitedir)/*.la || die
-	use sendto && { rm "${D}"/usr/lib*/nautilus-sendto/plugins/*.la || die; }
-
-	# Note: Python 3 support would need __pycache__ file removal too
-	use gconf || { rm "${D}"/$(python_get_sitedir)/${PN}/plugins/config/Gconf.py* || die; }
-	use policykit || { rm -rf "${D}"/usr/share/polkit-1 || die; }
-	use pulseaudio || { rm "${D}"/$(python_get_sitedir)/${PN}/{main/Pulse*.py*,plugins/manager/Pulse*.py*} || die; }
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-wireless/blueman/blueman-1.98_p20150105.ebuild b/net-wireless/blueman/blueman-1.98_p20150105.ebuild
index f7d48ffd1d37..7c0522583392 100644
--- a/net-wireless/blueman/blueman-1.98_p20150105.ebuild
+++ b/net-wireless/blueman/blueman-1.98_p20150105.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-1.98_p20150105.ebuild,v 1.1 2015/01/05 19:50:38 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-1.98_p20150105.ebuild,v 1.2 2015/08/08 15:42:23 mgorny Exp $
 
 EAPI="5"
 
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit eutils python-single-r1 gnome2-utils autotools
 
 DESCRIPTION="GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks"
-HOMEPAGE="http://blueman-project.org/"
+HOMEPAGE="https://github.com/blueman-project/blueman"
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
diff --git a/net-wireless/blueman/files/blueman-1.23_p20140717-set-codeset-for-gettext-to-UTF-8-always.patch b/net-wireless/blueman/files/blueman-1.23_p20140717-set-codeset-for-gettext-to-UTF-8-always.patch
deleted file mode 100644
index 258f65cc34cd..000000000000
--- a/net-wireless/blueman/files/blueman-1.23_p20140717-set-codeset-for-gettext-to-UTF-8-always.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-diff --git a/apps/blueman-adapters b/apps/blueman-adapters
-index e6f1b16..95f6997 100755
---- a/apps/blueman-adapters
-+++ b/apps/blueman-adapters
-@@ -6,6 +6,7 @@ from gi.repository import Pango
- import os.path
- import sys
- import signal
-+from locale import bind_textdomain_codeset
- 
- #support running uninstalled
- _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-@@ -34,6 +35,7 @@ class BluemanAdapters:
- 
-         builder = Gtk.Builder()
-         builder.set_translation_domain("blueman")
-+        bind_textdomain_codeset("blueman", "UTF-8")
-         builder.add_from_file(UI_PATH + "/adapters.ui")
-         self.dialog = builder.get_object("dialog")
- 
-diff --git a/apps/blueman-assistant b/apps/blueman-assistant
-index dc7f18f..47893da 100755
---- a/apps/blueman-assistant
-+++ b/apps/blueman-assistant
-@@ -16,6 +16,7 @@ import random
- import signal
- import dbus.glib
- from optparse import OptionParser
-+from locale import bind_textdomain_codeset
- 
- #support running uninstalled
- _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-@@ -63,6 +64,7 @@ class Assistant(Agent):
- 
-         self.Builder = Gtk.Builder()
-         self.Builder.set_translation_domain("blueman")
-+        bind_textdomain_codeset("blueman", "UTF-8")
-         self.Builder.add_from_file(UI_PATH + "/assistant.ui")
-         self.assistant = self.Builder.get_object("assistant")
-         self.assistant.set_title(_("Bluetooth Assistant"))
-diff --git a/apps/blueman-manager b/apps/blueman-manager
-index f31d219..e938601 100755
---- a/apps/blueman-manager
-+++ b/apps/blueman-manager
-@@ -27,6 +27,7 @@ import dbus, dbus.glib
- from blueman.Constants import *
- import gi
- gi.require_version("Gtk", "3.0")
-+from locale import bind_textdomain_codeset
- from gi.repository import Gtk
- from gi.repository import GObject
- from blueman.bluez.BlueZInterface import BlueZInterface
-@@ -62,6 +64,7 @@ class Blueman:
- 
-         self.Builder = Gtk.Builder()
-         self.Builder.set_translation_domain("blueman")
-+        bind_textdomain_codeset("blueman", "UTF-8")
-         self.Builder.add_from_file(UI_PATH + "/manager-main.ui")
- 
-         self.window = self.Builder.get_object("window")
-diff --git a/apps/blueman-sendto b/apps/blueman-sendto
-index e72e6ab..ce25926 100755
---- a/apps/blueman-sendto
-+++ b/apps/blueman-sendto
-@@ -13,6 +13,7 @@ from optparse import OptionParser
- import gettext
- import urllib
- import time
-+from locale import bind_textdomain_codeset
- 
- from blueman.Constants import *
- import gi
-@@ -46,6 +47,7 @@ class Sender(GObject.GObject):
-         GObject.GObject.__init__(self)
-         self.Builder = Gtk.Builder()
-         self.Builder.set_translation_domain("blueman")
-+        bind_textdomain_codeset("blueman", "UTF-8")
-         self.Builder.add_from_file(UI_PATH + "/send-dialog.ui")
-         self.window = self.Builder.get_object("window")
- 
-diff --git a/apps/blueman-services b/apps/blueman-services
-index 25a529b..4b4419c 100755
---- a/apps/blueman-services
-+++ b/apps/blueman-services
-@@ -2,6 +2,7 @@
- 
- import os
- import sys
-+from locale import bind_textdomain_codeset
- #support running uninstalled
- _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
- if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):
-@@ -29,6 +30,7 @@ class BluemanServices:
- 
-         self.Builder = Gtk.Builder()
-         self.Builder.set_translation_domain("blueman")
-+        bind_textdomain_codeset("blueman", "UTF-8")
-         self.Builder.add_from_file(UI_PATH + "/services.ui")
- 
-         self.Config = Config()
-diff --git a/blueman/gui/GsmSettings.py b/blueman/gui/GsmSettings.py
-index ee07e62..e58277b 100644
---- a/blueman/gui/GsmSettings.py
-+++ b/blueman/gui/GsmSettings.py
-@@ -21,6 +21,7 @@ from blueman.Functions import *
- from blueman.Constants import *
- 
- from gi.repository import Gtk
-+from locale import bind_textdomain_codeset
- 
- class GsmSettings(Gtk.Dialog):
- 	def __init__(self, bd_address):
-@@ -30,6 +31,7 @@ class GsmSettings(Gtk.Dialog):
- 		
- 		self.Builder = Gtk.Builder()
- 		self.Builder.set_translation_domain("blueman")
-+                bind_textdomain_codeset("blueman", "UTF-8")
- 		self.Builder.add_from_file(UI_PATH +"/gsm-settings.ui")
- 		
- 		vbox = self.Builder.get_object("vbox1")
-diff --git a/blueman/gui/applet/PluginDialog.py b/blueman/gui/applet/PluginDialog.py
-index f994cc9..84d6370 100644
---- a/blueman/gui/applet/PluginDialog.py
-+++ b/blueman/gui/applet/PluginDialog.py
-@@ -23,6 +23,7 @@ from blueman.Functions import *
- 
- from blueman.gui.GenericList import GenericList
- import weakref
-+from locale import bind_textdomain_codeset
- 
- class SettingsWidget(Gtk.VBox):
- 	def __init__(self, inst):
-@@ -118,6 +119,7 @@ class PluginDialog(Gtk.Dialog):
- 		
- 		self.Builder = Gtk.Builder()
- 		self.Builder.set_translation_domain("blueman")
-+                bind_textdomain_codeset("blueman", "UTF-8")
- 		self.Builder.add_from_file(UI_PATH +"/applet-plugins-widget.ui")
- 		
- 		self.set_title(_("Plugins"))
-diff --git a/blueman/main/applet/BluezAgent.py b/blueman/main/applet/BluezAgent.py
-index 868dbe9..403077a 100644
---- a/blueman/main/applet/BluezAgent.py
-+++ b/blueman/main/applet/BluezAgent.py
-@@ -25,6 +25,7 @@ from gi.repository import Gtk
- from gi.repository import GObject
- from gi.types import GObjectMeta
- import cgi
-+from locale import bind_textdomain_codeset
- import blueman.bluez as Bluez
- from blueman.Sdp import *
- from blueman.Constants import *
-@@ -68,6 +69,7 @@ class CommonAgent(GObject.GObject, Agent):
-                 editable.stop_emission("insert-text")
- 
-         builder = Gtk.Builder()
-+        bind_textdomain_codeset("blueman", "UTF-8")
-         builder.add_from_file(UI_PATH + "/applet-passkey.ui")
-         builder.set_translation_domain("blueman")
-         dialog = builder.get_object("dialog")
-diff --git a/blueman/plugins/applet/NetUsage.py b/blueman/plugins/applet/NetUsage.py
-index 1584580..6262ff0 100644
---- a/blueman/plugins/applet/NetUsage.py
-+++ b/blueman/plugins/applet/NetUsage.py
-@@ -33,7 +33,7 @@ import dbus
- import time
- import datetime
- import gettext
--
-+from locale import bind_textdomain_codeset
- 
- class MonitorBase(GObject.GObject):
-     __gsignals__ = {
-@@ -150,6 +150,7 @@ class Dialog:
-         builder = Gtk.Builder()
-         builder.add_from_file(UI_PATH + "/net-usage.ui")
-         builder.set_translation_domain("blueman")
-+        bind_textdomain_codeset("blueman", "UTF-8")
- 
-         self.dialog = builder.get_object("dialog")
-         self.dialog.connect("response", self.on_response)
-diff --git a/blueman/plugins/services/Audio.py b/blueman/plugins/services/Audio.py
-index b44d6b5..4b13e8f 100644
---- a/blueman/plugins/services/Audio.py
-+++ b/blueman/plugins/services/Audio.py
-@@ -19,6 +19,7 @@
- 
- from gi.repository import Gtk
- import dbus
-+from locale import bind_textdomain_codeset
- from blueman.Constants import *
- from blueman.plugins.ServicePlugin import ServicePlugin
- 
-@@ -35,6 +36,7 @@ class Audio(ServicePlugin):
- 		
- 		self.Builder = Gtk.Builder()
- 		self.Builder.set_translation_domain("blueman")
-+                bind_textdomain_codeset("blueman", "UTF-8")
- 		self.Builder.add_from_file(UI_PATH +"/services-audio.ui")
- 		self.widget = self.Builder.get_object("audio")
- 		
-diff --git a/blueman/plugins/services/Network.py b/blueman/plugins/services/Network.py
-index e003345..bd705d9 100644
---- a/blueman/plugins/services/Network.py
-+++ b/blueman/plugins/services/Network.py
-@@ -18,6 +18,7 @@
- # 
- 
- from gi.repository import Gtk
-+from locale import bind_textdomain_codeset
- from blueman.Constants import *
- from blueman.Functions import have, dprint, mask_ip4_address
- from blueman.Lib import get_net_interfaces, get_net_address, get_net_netmask
-@@ -36,6 +37,7 @@ class Network(ServicePlugin):
- 		
- 		self.Builder = Gtk.Builder()
- 		self.Builder.set_translation_domain("blueman")
-+                bind_textdomain_codeset("blueman", "UTF-8")
- 		self.Builder.add_from_file(UI_PATH +"/services-network.ui")
- 		self.widget = self.Builder.get_object("network")
- 		
-diff --git a/blueman/plugins/services/Transfer.py b/blueman/plugins/services/Transfer.py
-index 55024d3..ffd75ec 100644
---- a/blueman/plugins/services/Transfer.py
-+++ b/blueman/plugins/services/Transfer.py
-@@ -18,6 +18,7 @@
- # 
- 
- from gi.repository import Gtk
-+from locale import bind_textdomain_codeset
- from blueman.Constants import *
- from blueman.plugins.ServicePlugin import ServicePlugin
- 
-@@ -32,6 +33,7 @@ class Transfer(ServicePlugin):
- 		
- 		self.Builder = Gtk.Builder()
- 		self.Builder.set_translation_domain("blueman")
-+                bind_textdomain_codeset("blueman", "UTF-8")
- 		self.Builder.add_from_file(UI_PATH +"/services-transfer.ui")
- 		self.widget = self.Builder.get_object("transfer")
-