Version bump, drop old

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 71 insertions, 117 deletions

diff --git a/gnome-extra/gnome-do-plugins/ChangeLog b/gnome-extra/gnome-do-plugins/ChangeLog
index 5ad1e45073d3..ebb27971c4d7 100644
--- a/gnome-extra/gnome-do-plugins/ChangeLog
+++ b/gnome-extra/gnome-do-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-do-plugins
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do-plugins/ChangeLog,v 1.24 2012/05/13 12:39:35 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do-plugins/ChangeLog,v 1.25 2014/11/22 18:05:49 pacho Exp $
+
+*gnome-do-plugins-0.8.5 (22 Nov 2014)
+
+  22 Nov 2014; Pacho Ramos <pacho@gentoo.org> +gnome-do-plugins-0.8.5.ebuild,
+  -files/gnome-do-plugins-0.8.2-mono26.patch,
+  -files/gnome-do-plugins-0.8.2-mono28.patch, -gnome-do-plugins-0.8.4.ebuild:
+  Version bump, drop old
 
   13 May 2012; Agostino Sarubbo <ago@gentoo.org>
   -gnome-do-plugins-0.8.2-r1.ebuild, -gnome-do-plugins-0.8.3.ebuild:
@@ -137,4 +144,3 @@
   +files/do-plugins-optional-ext-dep.patch, +metadata.xml,
   +gnome-do-plugins-0.3.0.ebuild:
   Initial import, thanks to Arun Raghavan in #207396.
-
diff --git a/gnome-extra/gnome-do-plugins/Manifest b/gnome-extra/gnome-do-plugins/Manifest
index 9b5f59cf627d..7d4df4b3849f 100644
--- a/gnome-extra/gnome-do-plugins/Manifest
+++ b/gnome-extra/gnome-do-plugins/Manifest
@@ -1,20 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX gnome-do-plugins-0.8.2-mono26.patch 546 RMD160 20b7f6eb0a59e1f359d581bd81e485e43e159137 SHA1 1930930812a5013eee2ad3fbf98ffd5d5b360ac5 SHA256 91f08225399a244ad3d9f4ae23e21c8b23319d71ba3411c0704b6a5ee36ad9b6
-AUX gnome-do-plugins-0.8.2-mono28.patch 1597 RMD160 126c006473eb5be1a95c50500c66e7e759bf69a8 SHA1 3be36dac97966aff3225ca817b491b782f62c7f8 SHA256 16f727d0a816c220c66e0f34864a2eae682e974f3dd61167626be896e1107a6c
-DIST gnome-do-plugins-0.8.4.tar.gz 3098327 RMD160 f0dbf4e078343995bab81c0e6bbbfe528f981d1a SHA1 10eccf4d38f7d9a20760d7c4d96cd87438fc155e SHA256 8f24cbcde292e397bc99e7cf42141e3b72f761e6ba7718bf3bf680803ec7236e
-EBUILD gnome-do-plugins-0.8.4.ebuild 1062 RMD160 2940523453d6c9827b2d8fcb849648067ad84105 SHA1 563644318566257e38c52a041ebd2ea8314d3325 SHA256 8e3766eea372ed12a2342559f011e0af5a5afaf250bdadd6ee08f0ee6ca0b1eb
-MISC ChangeLog 5150 RMD160 9dac726251fc4a5f7095c481d2e0ade4362d0f46 SHA1 857f825b27ea2f71e27d83b3b296930073140b84 SHA256 7c06765ce978113b8da4456aa1b88ac9b52f6c470014d3d4b5b0b1e4ab8be479
-MISC metadata.xml 324 RMD160 1ca2e7cbc74b502fb19653f5f73c82a096864c0e SHA1 b571c6a8d617a04803b7af2a94799e6657d5b0ce SHA256 a08b51f9f3c3977c0143b3a3137096e5f7b12fa1c88b6f630431e60d89d13dba
+DIST gnome-do-plugins-0.8.5.tar.gz 3176035 SHA256 c4b544bd08a31e86b83311c49db85d8fdf3130803dfd37acd0c89e7843548f3c SHA512 55b1287fb1cca7cea8b681ebce470ee405594b64d6bf60b0f2dac60cc4267ac28c22fd8bdd8ffa9893abba7e93844eed498799cbe6594098bdca3d38923ea890 WHIRLPOOL dfa3810332f495f96085beef6c8893f4975da21050ed41d231ead43d3b4833d8973be112809bd08a0bda79c578e45e52cb3a414e689c6e9b304f62a15f458b6f
+EBUILD gnome-do-plugins-0.8.5.ebuild 1254 SHA256 266c82e5f47b875bdfd4c3cc6a2e42d2e8600e1311b278f7c068fd4bf2d7dc6c SHA512 f27281487b9a82d3e134d812ff1b4edba3c04a2a98baa378e6284de5b70503da061de98c8801bead0d09fa74bacce27acd83d814de9a824ffafac8ba9dce8a04 WHIRLPOOL a169c4dc49ce40e3e39bfa92f107da46789c1c4e13137737b592a7266e8b71a9c1345e1ee762ac79fb24f3df3f0518095f86b422d2c4dd91517461e91191933c
+MISC ChangeLog 5418 SHA256 b7d85a6fad179b4296f277072245f686f2d677b9b7863b73055ac07dc1a13515 SHA512 ea222e8cbe20db9075c8e7bd452039136a99a3fd5a5cb0c6d030bb63af11122ce7c0af708ece985aefe38a2e61687efec3639624b60e4e6f4a3b597a33ed0e32 WHIRLPOOL fd285e0460212fbfe579e83a8b79ff8dc9ce94428fa1ece6324f5abb9190e37e718caa8417324606d3b8a62bb84b836736e19969b3a4ef001c6b6e58680b44ac
+MISC metadata.xml 324 SHA256 a08b51f9f3c3977c0143b3a3137096e5f7b12fa1c88b6f630431e60d89d13dba SHA512 ef4027146d4baacabb2b03f139428ee2510af3154d98b6218d7e35c02d60bc54a44052f4ee9efd9413134df44837c3a420bcc2f8c5099808c0d1a2cda6c38e85 WHIRLPOOL 16aa0d6d6e41b23e411b4d8291021a67635204fa99752339307d112ad049c4bfc25ff81ebafaee26b03a3482f0f00613132dfe6cef017f1fe5c10831fbffdee0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCgAGBQJPr6uMAAoJEOTDgjZ80txdSlAIAKDhffdJGfr8xFpeCfbztxJ8
-VSjDZ/Gdk8Qk4lw+Y+zU8ej/pQf/N4nMKDR1pkMGbYXtyR3xv6Q15Hiokls+I2es
-3jqIpW1GI75lOi+HZ71/bprSwJCwjzsIjXOo6kW5h57xjyY+cqtbs4RNLoVMZ+KQ
-83Cc2tEQw/xzipKizmxte2XiizcjZvTMVTx+hjJ68UrfcdU17e7pQSl1XURvqoQt
-cD3aWpMT+4b+L57c8mwWEq40FNoAo8eL4a5ifkeaTJHlT6k2Yzi2eD0DMWZwXKPj
-eqPta/kwo4lRriEZoyrbHJz3fAR4YNCm68MVCZzpjOG1JpKDyWNiHFeQyMeAk7o=
-=Ch/4
+iEYEAREIAAYFAlRw0H8ACgkQCaWpQKGI+9TGLwCcDzSJJfDbKhSms9DaE2nDyA6e
+ty4An0+B3WxpQaTe5Ys07D35taLjbJyM
+=j4X7
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-do-plugins/files/gnome-do-plugins-0.8.2-mono26.patch b/gnome-extra/gnome-do-plugins/files/gnome-do-plugins-0.8.2-mono26.patch
deleted file mode 100644
index e4aa8f2e695f..000000000000
--- a/gnome-extra/gnome-do-plugins/files/gnome-do-plugins-0.8.2-mono26.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream revision 678 fixes compilation with mono 2.6.
-
-=== modified file 'Evolution/src/ContactItemSource.cs'
---- Evolution/src/ContactItemSource.cs	2009-06-22 04:05:16 +0000
-+++ Evolution/src/ContactItemSource.cs	2010-02-12 01:08:47 +0000
-@@ -32,8 +32,8 @@
- {
- 	public struct ContactAttribute
- 	{
--		public string Detail { get; protected set; }
--		public string Key { get; protected set; }
-+		public string Detail { get; private set; }
-+		public string Key { get; private set; }
- 		
- 		public ContactAttribute (string key, string detail)
- 		{
-
diff --git a/gnome-extra/gnome-do-plugins/files/gnome-do-plugins-0.8.2-mono28.patch b/gnome-extra/gnome-do-plugins/files/gnome-do-plugins-0.8.2-mono28.patch
deleted file mode 100644
index 1dc125b39da5..000000000000
--- a/gnome-extra/gnome-do-plugins/files/gnome-do-plugins-0.8.2-mono28.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.launchpad.net/do-plugins/+bug/634564
-
---- Evolution/src/ContactItemSource.cs	2010-11-04 16:32:32.000000000 -0600
-+++ Evolution/src/ContactItemSource.cs	2010-11-04 16:34:25.000000000 -0600
-@@ -35,7 +35,7 @@
- 		public string Detail { get; set; }
- 		public string Key { get; set; }
- 		
--		public ContactAttribute (string key, string detail)
-+		public ContactAttribute (string key, string detail) : this ()
- 		{
- 			Key = key;
- 			Detail = detail;
---- File/src/Do/Do.FilesAndFolders/IndexedFolder.cs	2009-10-12 14:30:04.000000000 -0600
-+++ File/src/Do/Do.FilesAndFolders/IndexedFolder.cs	2010-11-04 16:34:45.000000000 -0600
-@@ -33,7 +33,7 @@
- 		public uint Level { get; private set; }
- 		public FolderStatus Status { get; private set; }
- 		
--		public IndexedFolder (string path, uint level, FolderStatus status)
-+		public IndexedFolder (string path, uint level, FolderStatus status) : this ()
- 		{
- 			if (path == null) throw new ArgumentNullException ("path");
- 			
---- Pidgin/src/PidginContactItemSource.cs	2009-10-12 14:30:04.000000000 -0600
-+++ Pidgin/src/PidginContactItemSource.cs	2010-09-01 16:41:10.000000000 -0600
-@@ -241,7 +241,7 @@
- 					}
- 					//if the alias is still null, let's try to get the server alias
- 					if (string.IsNullOrEmpty (alias))
--					    alias = Pidgin.GetBuddyServerAlias (protos[proto]) ?? null;
-+					    alias = (string) Pidgin.GetBuddyServerAlias (protos[proto]) ?? null;
- 					break;
- 				//let's pick up the custom icon as the metacontact's icon
- 				case "setting":
-@@ -278,4 +278,4 @@
- 			return buddy;
- 		}
- 	}
--}
-\ No newline at end of file
-+}
diff --git a/gnome-extra/gnome-do-plugins/gnome-do-plugins-0.8.4.ebuild b/gnome-extra/gnome-do-plugins/gnome-do-plugins-0.8.4.ebuild
deleted file mode 100644
index 323b92129a39..000000000000
--- a/gnome-extra/gnome-do-plugins/gnome-do-plugins-0.8.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do-plugins/gnome-do-plugins-0.8.4.ebuild,v 1.2 2012/05/05 06:25:18 jdhore Exp $
-
-EAPI=2
-
-inherit eutils gnome2 mono versionator
-
-MY_PN="do-plugins"
-PVC=$(get_version_component_range 1-3)
-
-DESCRIPTION="Plugins to put the Do in Gnome Do"
-HOMEPAGE="http://do.davebsd.com/"
-SRC_URI="https://launchpad.net/${MY_PN}/trunk/${PVC}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="banshee"
-
-RDEPEND=">=gnome-extra/gnome-do-${PV}
-		dev-dotnet/wnck-sharp
-		banshee? ( >=media-sound/banshee-1.4.2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf --enable-debug=no --enable-release=yes \
-		$(use banshee) \
-		--disable-empathy \
-		--disable-flickr || die "configure failed"
-}
-
-src_compile()
-{
-	# The make system is unfortunately broken for parallel builds and
-	# upstream indicated on IRC that they have no intention to fix
-	# that.
-	emake -j1 || die "make failed"
-}
diff --git a/gnome-extra/gnome-do-plugins/gnome-do-plugins-0.8.5.ebuild b/gnome-extra/gnome-do-plugins/gnome-do-plugins-0.8.5.ebuild
new file mode 100644
index 000000000000..2a8408035110
--- /dev/null
+++ b/gnome-extra/gnome-do-plugins/gnome-do-plugins-0.8.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do-plugins/gnome-do-plugins-0.8.5.ebuild,v 1.1 2014/11/22 18:05:49 pacho Exp $
+
+EAPI=5
+GCONF_DEBUG="yes"
+
+inherit autotools eutils gnome2 mono-env versionator
+
+MY_PN="do-plugins"
+PVC=$(get_version_component_range 1-3)
+
+DESCRIPTION="Plugins to put the Do in Gnome Do"
+HOMEPAGE="https://launchpad.net/do-plugins"
+SRC_URI="https://launchpad.net/${MY_PN}/trunk/${PVC}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="banshee"
+
+RDEPEND="
+	>=gnome-extra/gnome-do-0.9
+	dev-dotnet/wnck-sharp
+	banshee? ( >=media-sound/banshee-1.4.2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Skip failing plugins (from ArchLinux)
+	sed -i -e '/DiskMounter/d
+		/Transmission/d' Makefile.am || die
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use banshee) \
+		--disable-empathy \
+		--disable-flickr \
+		--disable-transmission
+}
+
+src_compile() {
+	# The make system is unfortunately broken for parallel builds and
+	# upstream indicated on IRC that they have no intention to fix
+	# that.
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_compile
+}