Version bump to 1.2.2 stabilise 1.2.1 on x86 and amd64. Drop overshadowed version.

(Portage version: 2.2.0_alpha71/cvs/Linux x86_64)

4 files changed, 16 insertions, 28 deletions

diff --git a/net-wireless/bluedevil/ChangeLog b/net-wireless/bluedevil/ChangeLog
index 3b4c2040c144..56d80325a212 100644
--- a/net-wireless/bluedevil/ChangeLog
+++ b/net-wireless/bluedevil/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/bluedevil
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluedevil/ChangeLog,v 1.17 2011/10/10 12:08:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluedevil/ChangeLog,v 1.18 2011/10/30 07:05:40 scarabeus Exp $
+
+*bluedevil-1.2.2 (30 Oct 2011)
+
+  30 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -bluedevil-1.1-r2.ebuild, bluedevil-1.2.1.ebuild, +bluedevil-1.2.2.ebuild,
+  -files/bluedevil-mimetypes.patch:
+  Version bump to 1.2.2 stabilise 1.2.1 on x86 and amd64. Drop overshadowed
+  version.
 
   10 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> bluedevil-1.2.1.ebuild:
   Drop handbook useflag, doc is just empty folder and it confuses the unpack.
diff --git a/net-wireless/bluedevil/bluedevil-1.2.1.ebuild b/net-wireless/bluedevil/bluedevil-1.2.1.ebuild
index 845944dfa7e6..3ceda54a5e40 100644
--- a/net-wireless/bluedevil/bluedevil-1.2.1.ebuild
+++ b/net-wireless/bluedevil/bluedevil-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluedevil/bluedevil-1.2.1.ebuild,v 1.2 2011/10/10 12:08:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluedevil/bluedevil-1.2.1.ebuild,v 1.3 2011/10/30 07:05:40 scarabeus Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://projects.kde.org/projects/extragear/base/bluedevil"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 SLOT="4"
 IUSE="debug"
 
diff --git a/net-wireless/bluedevil/bluedevil-1.1-r2.ebuild b/net-wireless/bluedevil/bluedevil-1.2.2.ebuild
index ee0f2b979edf..80b42330bdb8 100644
--- a/net-wireless/bluedevil/bluedevil-1.1-r2.ebuild
+++ b/net-wireless/bluedevil/bluedevil-1.2.2.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluedevil/bluedevil-1.1-r2.ebuild,v 1.2 2011/08/14 17:55:19 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluedevil/bluedevil-1.2.2.ebuild,v 1.1 2011/10/30 07:05:40 scarabeus Exp $
 
 EAPI=4
 
-KDE_LINGUAS="ca ca@valencia cs da de el en_GB eo es et eu fi fr hu it ja ko lt
-mai ms nb nds nl pa pl pt pt_BR ro ru sk sl sv th tr uk zh_TW"
+KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB eo es et eu fi fr hu it ja ko
+lt mai ms nb nds nl pa pl pt pt_BR ro ru sk sl sr sr@ijekavian
+sr@ijekavianlatin sr@latin sv th tr ug uk zh_CN zh_TW"
 inherit kde4-base
 
 DESCRIPTION="Bluetooth stack for KDE"
@@ -13,7 +14,7 @@ HOMEPAGE="http://projects.kde.org/projects/extragear/base/bluedevil"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 SLOT="4"
 IUSE="debug"
 
@@ -26,7 +27,3 @@ RDEPEND="${DEPEND}
 	app-mobilephone/obexd[-server]
 	app-mobilephone/obex-data-server
 "
-
-PATCHES=(
-	"${FILESDIR}/${PN}-mimetypes.patch"
-)
diff --git a/net-wireless/bluedevil/files/bluedevil-mimetypes.patch b/net-wireless/bluedevil/files/bluedevil-mimetypes.patch
deleted file mode 100644
index e5791faab635..000000000000
--- a/net-wireless/bluedevil/files/bluedevil-mimetypes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -urN bluedevil-1.1.old/src/bluedevil-mime.xml bluedevil-1.1/src/bluedevil-mime.xml
---- bluedevil-1.1.old/src/bluedevil-mime.xml	2011-05-30 11:52:54.000000000 +0200
-+++ bluedevil-1.1/src/bluedevil-mime.xml	2011-05-30 11:53:18.000000000 +0200
-@@ -23,13 +23,4 @@
-     <generic-icon name="preferences-system-bluetooth"/>
-     <comment>Service</comment>
-   </mime-type>
--  <mime-type type="virtual/bluedevil-input">
--    <comment>Service</comment>
--  </mime-type>
--  <mime-type type="virtual/bluedevil-audio">
--    <comment>Service</comment>
--  </mime-type>
--  <mime-type type="virtual/bluedevil-sendfile">
--      <comment>Service</comment>
--  </mime-type>
- </mime-info>