summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Farina <zerochaos@gentoo.org>2014-05-12 14:22:17 +0000
committerRick Farina <zerochaos@gentoo.org>2014-05-12 14:22:17 +0000
commit92e6efb53f78519d5c50581e92165b6a288f0030 (patch)
treea15a37b985a2dc76a1666091b7b262a511f2e351 /net-wireless
parentStable for amd64 wrt bug #506928 (diff)
downloadgentoo-2-92e6efb53f78519d5c50581e92165b6a288f0030.tar.gz
gentoo-2-92e6efb53f78519d5c50581e92165b6a288f0030.tar.bz2
gentoo-2-92e6efb53f78519d5c50581e92165b6a288f0030.zip
upstream merged the bluez5 branch into master
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/blueman/ChangeLog5
-rw-r--r--net-wireless/blueman/blueman-9999.ebuild3
2 files changed, 5 insertions, 3 deletions
diff --git a/net-wireless/blueman/ChangeLog b/net-wireless/blueman/ChangeLog
index 9f3f93175b83..3892dbcbee79 100644
--- a/net-wireless/blueman/ChangeLog
+++ b/net-wireless/blueman/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-wireless/blueman
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.18 2014/05/05 08:22:45 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.19 2014/05/12 14:22:17 zerochaos Exp $
+
+ 12 May 2014; Rick Farina <zerochaos@gentoo.org> blueman-9999.ebuild:
+ upstream merged the bluez5 branch into master
*blueman-9999 (05 May 2014)
diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
index ce05c3ef671b..a128f0296192 100644
--- a/net-wireless/blueman/blueman-9999.ebuild
+++ b/net-wireless/blueman/blueman-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-9999.ebuild,v 1.1 2014/05/05 08:22:45 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-9999.ebuild,v 1.2 2014/05/12 14:22:17 zerochaos Exp $
EAPI="5"
@@ -14,7 +14,6 @@ HOMEPAGE="http://blueman-project.org/"
if [[ ${PV} == "9999" ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}-project/${PN}.git"
- EGIT_BRANCH="bluez5"
KEYWORDS=""
else
SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz"