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

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

5 files changed, 33 insertions, 46 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/Manifest b/net-wireless/bluedevil/Manifest
index f8651baf87a0..0003c8ce09f1 100644
--- a/net-wireless/bluedevil/Manifest
+++ b/net-wireless/bluedevil/Manifest
@@ -1,27 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX bluedevil-mimetypes.patch 671 RMD160 b8e51681991cf75a2ea009095b000fe710d94efe SHA1 c620e564d8cf66ad3d00c46e3e3512cc72ed23f1 SHA256 fde30dd0a7c3e0ae64ca1141ef644033759978a234381823115810682e42ab2d
-DIST bluedevil-1.1.tar.bz2 149848 RMD160 53f5ecd5899faba70411633cdd816a20324b367a SHA1 eab13be3c7f8974dcdfd41f9c755a3d4acc3f6e6 SHA256 1c84af4c0cce76c02706174df0dd9359aa867b35748640f299a5a5b9612aa373
 DIST bluedevil-1.2.1.tar.bz2 187920 RMD160 0b05c7bedf41f3e39cf061b579976b76b44ab89e SHA1 7d06063a1b3db641bf307a48343bc416ad0ec4f0 SHA256 62863ace6126beaab75f5115d7b7d36f947126821d8f5cfe71bbd21059a5c96a
-EBUILD bluedevil-1.1-r2.ebuild 860 RMD160 9722bc20fe52758cc91e50da8d3cf9927ba43b4b SHA1 44b0c40349af3f54b395e05c844beafaa91ccb89 SHA256 1877978b53b348fa750f32717968470834e0bd4534e6d8a7a7b8dcca44fba03c
-EBUILD bluedevil-1.2.1.ebuild 869 RMD160 4731cd5281320da4cc1c1b63d2132f0e8096df7e SHA1 949ed5a2eb03ab22d806b027879944b88d223aed SHA256 d1625a4fe86e9d9a2c992a97204c154ec02133ac3d400d785e89910e4b15ba79
-MISC ChangeLog 2978 RMD160 4ba38bc07cf3fe684656b9b3358cc03b34986a71 SHA1 5922bc24832db332496a12ebce274dfc5d28ccff SHA256 615fc12cab06295b73f05b92ba80ee1221cf1cd58e9ba4b3c9f6e9d8e297f9fa
+DIST bluedevil-1.2.2.tar.bz2 189521 RMD160 da46d713bfce24c951da4f53ac843b4cee3e0358 SHA1 6d2264b37519893987abc4af02292e85fd2b5f9c SHA256 61bd5cb912d14e54bc907c96fa625a6dfddd8b9b3c70639b43d6d98cbab5babd
+EBUILD bluedevil-1.2.1.ebuild 867 RMD160 e342c1c23c03d09c936ecf03b7349a71db249dbf SHA1 15c757aa0f117ddb74aa15f048fe1f92f74a376b SHA256 bdb80d09dab3acec3e86dbc867cfd0bd3a36452ec1b5a594ecf52ff3d5161da9
+EBUILD bluedevil-1.2.2.ebuild 869 RMD160 906ab99fe40fa42382f6456cab3ff73ed94c8cff SHA1 06c84a2fca78e2027a812c39a3db13949d64b936 SHA256 4191dac18cf11ed3df9509e16af3837bb7f36f5747996e0f443898121a8e4de0
+MISC ChangeLog 3266 RMD160 94717a64bec2893b8647f17458a62ef7ae709101 SHA1 5ddabfad1280317fd26fdacced15e9a1ae91549f SHA256 36a97ee8a2d6fb21b50f922dd32158fa25532ea6e7ae830033e7870029a08c57
 MISC metadata.xml 158 RMD160 f15477b4ffb8ae0849cbae52329d1bdf99a407f4 SHA1 18cd6cdb98f781c3975c49f300d3f8b1e07333b8 SHA256 b5a2d16139d03b8af578bc87503b14b589dd7e3544d879297ccdb735d35a02e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOkt/zAAoJEOSiRoyO7jvouRYP/28l1mAaITovfze/BwQ1eq95
-Qi6hP51KrxgMb1WQXcxyh1vT5umJiRVeVfTLBmCmUdJWqMbe11dXBlr2LIClkw6R
-z6QIdwkIqQL8Np4rzSlrcOw4SlsgpV+xerlWNCzQqh9ZEpoyL6uc1rVSaqfh6MkJ
-C4o78gTq5HxVkVZN8j4EG/NW8v+b37DrHZRcsGzimTJDujhCchrN8dUKM9wQHXGk
-LYhjaziG5992FAh7ixtWs+Ubz+xRr0BNpSP1PhujDAWRhDL867LkW6UaqzCPTDuZ
-8qN6PjsClZDdzMV4ufg++xdx40RrkphkDWsNInSfTpPgx7YETfbpwM7IcMsMgCXk
-SZxJSPfMchsV0DCnEf+cxUD5qpVnPxiDfKKLkmTThTrX8KJ5/HbxW5jHFpJ+OmHg
-x6ggwcqW6vGKPb5NJBpCALA+wBgbqyQnoLtcXmrG5OXv23+E9P2TnBajp6bPjWhz
-83NY8JOiWvuqrnt/FlPAM9jYBsEZ/0kSR6rSXF9egDCFZlVPUHYyIk169MY4tV0K
-YXhnlH4bg8/XGJzBM1dPYMdMEKxhxkf2LTkqjZehjVuUmFXKYzO0zcPbvEPkSbab
-+tISe/Egc6Fd9I9pJd91DwnonQAAyu3eWX3iPmvLqxHjWJJDmk4i/V+plG+uK0W8
-ZH70agXXtrNe7hgbXDvD
-=aedO
+iQIcBAEBAgAGBQJOrPbdAAoJEOSiRoyO7jvotlAP/3KY8DdgQJJPbLVOk8ywDPbw
+Av+wu/nxyNBwtjp+8oPkdzFk6eQs3dR6C8h8F5iHuCLm4CZc8mdXlBXtCNsF8zyN
++j5ui47R9zFB+ngE6KYpJCGGLh+58LFD7nihkY9V4K/bVravb095HptM06ysa2Qh
+W/LJe5W4+4O9JKm7f129ogKVd5Nd03NKBcKou8pAtM6zY67UZSmo2teCclGe1OWB
+XOEmaO/ZUbdI0MJMi3+cOEMwTO+oii3g/d3EfpsZphaPmbU/z2K65EL3WJooZkIW
+dOETAQhFb235aAbHUIx66KeRK1v//+4Klr8wR6+9fP2FZvcehR/U8AthawnW0IYv
+C2F55CqWM2Ogbiinvb+/PNv8oyRu1VxBuXkq2ntBr8rIHAv5Bwk48g1j5x1joZDD
+wam2ktUwIBUaG2qHx8tuP9lTXxBfc322y1QayBpUYUFMLdPA2b4fMrI60Ra72oP5
+Q/qPBvyKoNeIOFAeJUjJ/FzToZjPwT8RykAqJRHtTick2Z6k+AQYtUui6rAtz5kH
+NHYXAypQuuFkTYgnBodimdzm93y0rHBTVC80Yoti3rnGLLmETp3QfNgZLIs62EZM
+aKqklYEbBda+pGpg2cf7DOTBg+UTlX2gCs4elQKGcsYSdwGlFSAFBP42rmlGkunA
+eH7wwB6b6+PxitHIvkrv
+=ClI6
 -----END PGP SIGNATURE-----
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>