add Vinagre ebuild and clean up morituri ebuilds

8 files changed, 35 insertions, 182 deletions

diff --git a/media-sound/morituri/Manifest b/media-sound/morituri/Manifest
index 7ee6a2f..a66de79 100644
--- a/media-sound/morituri/Manifest
+++ b/media-sound/morituri/Manifest
@@ -1,3 +1,3 @@
-DIST v0.2.0.tar.gz 183202 SHA256 878bea49b63b50161cf17adce61e5ece83f420b857568ad5d608f1ee4cae1072 SHA512 6dd000433b874c6c2f7c0ed8d0e9f9d997624d4fe1e6e7addd6a9f600d9137ca8a5f58a7f77a2fe3c1202478c728f2a8ff455ca944d4820f76d8ef54437a7626 WHIRLPOOL f478274a1bfedf88f3f112034d308cda88992fb3f7f0238b4e473f4cb9942c0abceed06a5270e2ffd411fc723b1df8648f54ec78bc8e8d9f5ff77326c282ea8f
-EBUILD morituri-0.2.0.ebuild 1558 SHA256 9522c8aee2473117b55bcb2153914c54ae194d5b8b8b0c49f2f488520e36b16e SHA512 7052abc17098079b56a1378e3ecb2c759b9fd63d112780f22b85ed7e0b961535527d6314aa0437e8fdd8320a0fce6fd65d5ec75cb25a38ca7afe056743bc7b99 WHIRLPOOL b0e598d39706e2e65587730d0b268ff7e0372d5f0c073dbcef509a9ab1614353c290b383be45b9bc062b35fcd0050281f1b7af4ef777dd4dc880ef19b261325a
-EBUILD morituri-9999.ebuild 1493 SHA256 29d00579c5c5ffae4724d59363afc96fd8ccd2d0942071b66efa58f0181f2944 SHA512 7fd5ae65f8681a9a10556cc49a0719a914f21f4abd38ce6de27f802784aedd4b4af0ac75f404f3475b89c2d289e32db19f42d56fa96f430d45621db60c208c0d WHIRLPOOL 5c0163b0f9bddfad1282a0848c2bdcc0c4105d60c01f912bce32e45ea5aa20159dca5320a712434d8eeae61bd6ea33b74ff68b9eb17c5c0e8403d4e844640474
+DIST v0.2.3.tar.gz 200204 SHA256 1a7c961982683eb86e5d7758a633bca536e13f2b15773cd3ac1834ba42785ff4 SHA512 5485ccceeb15c2b3c6f02d9e78be17e834214120f3975c9796684dcbf72e477138cd50e559566177379dd2969dd54da9453c6eeef4e41fdeaa024e9c0348bbc2 WHIRLPOOL 9a8cab1890d12e4ca56f97c6f6a8e1d375464d4b4c309742cc569055fd22e33c37a228a1c0ee5e7588b76360f62a24d5a565239934bdb25ed52d7d89f54d285d
+EBUILD morituri-0.2.3.ebuild 1772 SHA256 38d3f8c31d1cef23d4c63afd5d2069d99615cfcf3c03c956d6d9111ba2310123 SHA512 bbd892c8808b5f54da398cccc8794d525bdffd4c87ddbd526328c40949bdae484629a3a8a4527b24ebd98ac1df8ec726f9493fa4a0cb03202ece8f1367d50825 WHIRLPOOL 093852837e6e69c027606be698a93b680e8e2117927039889d31d0d104a141e54092809e250120b9b8ed481b1bd433cd1f00bed9ea1ca92571bc72195ec3986d
+EBUILD morituri-9999.ebuild 1491 SHA256 73581042a3289fcaba075e118c684b6b4e0f9fc34adf7282d9c12d8d8306cbe3 SHA512 8bf6a7b37f43316edc398e059a1b962746f3c0c6b43feead42f7f66ef0986acd5442c87cb1836b6d9188755527588fd1e9a4fc89742f836532c0e7d6b266a74c WHIRLPOOL 950deaa169f0b21cba4d66c5214b906b6d41a68979a3217ec3ca3d3c8b55481232bca86678bc0f766fedbf4cb59e721c0564ff29b611d6c64e25ae7effc44dba
diff --git a/media-sound/morituri/morituri-0.2.0.ebuild b/media-sound/morituri/morituri-0.2.0.ebuild
deleted file mode 100644
index 0075f60..0000000
--- a/media-sound/morituri/morituri-0.2.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-PYTHON_COMPAT="python2_7"
-
-inherit bash-completion-r1 python-single-r1 eutils autotools git-2
-
-DESCRIPTION="A CD ripper aiming for accuracy over speed."
-HOMEPAGE="http://thomas.apestaart.org/morituri/trac/"
-SRC_URI="https://github.com/thomasvs/${PN}/archive/v${PV}.tar.gz"
-
-EGIT_REPO_URI="git://github.com/thomasvs/morituri.git"
-EGIT_HAS_SUBMODULES=1
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="alac cdio doc +cddb +flac test wav wavpack"
-
-RDEPEND="media-sound/cdparanoia
-	media-plugins/gst-plugins-cdparanoia
-	app-cdr/cdrdao
-	media-libs/gstreamer
-	>=media-libs/gst-plugins-base-0.10.22
-	alac? ( media-plugins/gst-plugins-ffmpeg )
-	cdio? ( dev-python/pycdio )
-	cddb? ( dev-python/cddb-py )
-	flac? ( media-plugins/gst-plugins-flac )
-	wav? ( media-libs/gst-plugins-good )
-	wavpack? ( media-plugins/gst-plugins-wavpack )
-	doc? ( dev-python/epydoc )
-	test? ( dev-python/pychecker )
-	dev-python/gst-python
-	dev-python/python-musicbrainz
-	dev-python/python-musicbrainz-ngs
-	dev-python/pygobject
-	dev-python/pygtk
-	dev-python/pyxdg"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	# disable doc building
-	local ac_cv_prog_EPYDOC=""
-
-	# disable test
-	local ac_cv_prog_PYCHECKER=""
-
-	default
-}
-
-src_install() {
-	default
-
-	python_doscript bin/rip
-
-	rm -rf "${D}/etc" || die
-	dobashcomp etc/bash_completion.d/rip
-
-	dodoc AUTHORS HACKING NEWS README RELEASE TODO
-
-	use doc && dohtml -r doc/reference/*
-}
diff --git a/media-sound/morituri/morituri-9999.ebuild b/media-sound/morituri/morituri-9999.ebuild
index e7ddde6..2863fa4 100644
--- a/media-sound/morituri/morituri-9999.ebuild
+++ b/media-sound/morituri/morituri-9999.ebuild
@@ -4,14 +4,14 @@
 
 EAPI="5"
 
-PYTHON_COMPAT="python2_7"
+PYTHON_COMPAT=(python2_7)
 
 inherit bash-completion-r1 python-single-r1 eutils autotools git-2
 
 DESCRIPTION="A CD ripper aiming for accuracy over speed."
 HOMEPAGE="http://thomas.apestaart.org/morituri/trac/"
 
-EGIT_REPO_URI="git://github.com/thomasvs/morituri.git"
+EGIT_REPO_URI="https://github.com/thomasvs/morituri"
 EGIT_HAS_SUBMODULES=1
 
 LICENSE="GPL-3"
diff --git a/net-misc/vinagre/ChangeLog b/net-misc/vinagre/ChangeLog
index c2be4a1..8ee98f2 100644
--- a/net-misc/vinagre/ChangeLog
+++ b/net-misc/vinagre/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for net-misc/vinagre
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.110 2014/12/23 23:08:46 eva Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.115 2015/03/15 13:32:22 pacho Exp $
+
+  15 Mar 2015; Pacho Ramos <pacho@gentoo.org> vinagre-3.14.3.ebuild:
+  x86 stable, bug 534012
+
+  14 Mar 2015; Pacho Ramos <pacho@gentoo.org> vinagre-3.14.3.ebuild:
+  amd64 stable, bug 534012
+
+  04 Feb 2015; Pacho Ramos <pacho@gentoo.org> vinagre-3.14.3.ebuild:
+  Rekeyword on ia64
+
+  05 Jan 2015; Pacho Ramos <pacho@gentoo.org> vinagre-3.14.3.ebuild:
+  Reorder the patch applying and add a comment for it
+
+  04 Jan 2015; Justin Lecher <jlec@gentoo.org> vinagre-3.14.3.ebuild,
+  +files/vinagre-3.14.3-freerdp.patch, metadata.xml:
+  Backport patch to work with freerdp-1.2.0_beta, #531336
 
 *vinagre-3.14.3 (23 Dec 2014)
 
diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
index 275bbd7..06da62d 100644
--- a/net-misc/vinagre/Manifest
+++ b/net-misc/vinagre/Manifest
@@ -1,5 +1,5 @@
-AUX freerdp-1.2.0.patch 972 SHA256 ff6b9ebc21487ad5012d4c157bafced5d308d3d248608a645c2006a66869153d SHA512 2a0d9cde41d24efa4ee38c1012faf7bd150178ba1de2c776a3f86612fbef82e711d40c1976c3f335b387e3160aafe4fc1447e175ada9b6245765cbb23c061178 WHIRLPOOL a25cf6f68e9bb5ad0b5e5cac51552c33aef0a0b1e4750a322cc16fb1fcf22e327b45d59a7642e0ab1979338647d0946c8bf2ab0de9e656a4249a0334db5a7394
-DIST vinagre-3.14.3.tar.xz 1101544 SHA256 f82d8c66684a00a79422724b0e1efad28ba35ba21a92dc7dcb867ed7b64659f0 SHA512 80d87d3aab0e11c2990e6f8f369095e7587a3d2def0afe1e0be2cae31e376bc40c902180b92d84c196ded8c1973dca8421dd5d66ecda5d6d1e41e3fe0aa02ccd WHIRLPOOL 9a38f134b27e1064b186df2c53daacc268e719458fc13fab81a7013972966c107d30c9041082578c4fd0ca037b4285bf9df69ed0f2b900f77ec54fe633539c04
-EBUILD vinagre-3.14.3.ebuild 1533 SHA256 3ec88be788bcea3a2e7bcb80e66004bd995943d848fdd2651d4b507b23ac2a94 SHA512 5b2638d0c72a440c72d95a54d2d1b6b5bffd7349230c51050064a1f9645dce10f269250efc060857a025a6cfa1b8a823d493e2d6485514b55b0ee7669dc00a55 WHIRLPOOL 96def08662d517d2c6c523194ac2f51a10b7218f03520e51af653a4e8e2c8a70bedfced8351b79c9a78046e3fe2c3525d47e7c646f95926a4074356625a791d9
-MISC ChangeLog 15303 SHA256 1fe8d00a149813f033cd289bca1b51f6f9e50134d108baf7c5198aeef21d4d1d SHA512 5f7da13be0037251275c6dbaba4b837f4f9167c410dcc51cee0e853b3c9ef19d9b6e2e4ae88681e8d372ae483f8be5ff24752c28090f223cfa067744fa4c672e WHIRLPOOL 36a9928571d362be7669b9a058875f5e95844d0318075622179afa5d6a9fa337029e7af2e2b02cd89062a9eba508a77d77b681b1b66fea35be62f82b16b1ee38
-MISC metadata.xml 541 SHA256 b6870da5808fae6b5ceed61f0b35e6367f531f671e270c58f0bd45c52cc49d65 SHA512 00e08cd84141020f44cccb0064f0b92a458dd49d7221a4b0078e20206761508ecf1eee3cf5d7e20e6876347b87888f3bfefe69a8397fa59e108fdef75dc38e46 WHIRLPOOL 17b85c3451b68efb39ca13c8dd81df475bfbc112d2f90ea953230d5eb09560b9082623cb02c28cb8b45a790de0ca0df2a95164a5aa2b0b45e23b2b43d1573869
+AUX vinagre-rdp-1.2.1-def.patch 942 SHA256 70308c7ee8f43701132e9f26ed05cb107e2931b22ac9369bf98b2950719f20e7 SHA512 c96374b62f97a8b004eb8ebf1eb0ef9daad1e348b7d40efab6e22a038418d428481d4bebbad1385ff81e1aff4a369736e094e1d04350a63594481a2047ffb92a WHIRLPOOL f4f35d93aa23032fb397eed21ac0fa0a82ca1ecba82bf2ec9b983501818491cabc4da8745b53a926298330b417cb77990885d162cdf5385890b43e0bc1aaee9e
+DIST vinagre-3.16.1.tar.xz 812964 SHA256 d77c0057e8525efeef8b35839bce07e5451d99f3ef9d156c7f549a4c1ad6483f SHA512 60b83a7eb8f4d49e8825a4116d2de4579373cb4fbcde70c241b43f079debc30f0b5ce38da39ed4a3841724a70798338a7c319c72be0e991b97f70cdc264dfacf WHIRLPOOL 24828f91d545fd8da63f14002b1988a677c37ffc3abd10678467cfe5223ec4adbd4c9cec39e1ad7c4d46e2beb7369109445f7e1c19e5d10b7be6b79533c99a50
+EBUILD vinagre-3.16.1-r1.ebuild 1444 SHA256 3885eafc09b86f95ec813704445babb91243442ccf94093985448747dc2aaa43 SHA512 26d39fd1b41e464e2b9fb1889b15b0751e5addd2f32608d81ceae04c265ec0a3b4201e54cb1fedb1f782b2f8ef2cb0f656103f2b34b85c6009adc01320c7e92e WHIRLPOOL 7f2d25b8a8b9f7785e9a22e34dca5f9561d4f0a0d76d61830e4a736bea5e041b513d4c539bb4e84ead51d605229322fb493a16213f72471aabf843eba281a280
+MISC ChangeLog 15893 SHA256 9f3b567d69494b007bcc0fc3370a96c51c61509df5c72857586dfaa6816230c0 SHA512 fb22267b273f337c067168f3b219bee154b5a66c5094b5b062149533d6cb9a0c6f097907829de2ef5ab9c6e50cf336e4eeebb5c79f688669749386862535f4b6 WHIRLPOOL ae5ce70e5a68aa0874664b5a3eb10eead443a03b7f1e540b76a49d618872b0d17813b54e1fe503127a5c82ed1506e919a8eae394cb3ab25ed3ab7541262b36db
+MISC metadata.xml 552 SHA256 1f37c243a68e72fd200b1bdd3c6e3068c805923ed142ca4ba7b2b3bf79afc1cf SHA512 823a63d72cba6eec8652ecf3dba2041654a9404160f8f83c9fa937ecb090cb4728b66fbf976df06e3a026fb07bfb1d744374b5ad84cb043aa87eb9b8d2858726 WHIRLPOOL d2584cb01c5a2d4412283f28093c07c4a72b5112d75c9c48611c1ed69239d702ac2244530afc68a1761e390c49aa21bcf9fb2a5af6a4ebab0d4d738e24d060b4
diff --git a/net-misc/vinagre/files/freerdp-1.2.0.patch b/net-misc/vinagre/files/freerdp-1.2.0.patch
deleted file mode 100644
index 587ddb8..0000000
--- a/net-misc/vinagre/files/freerdp-1.2.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/plugins/rdp/vinagre-rdp-tab.c b/plugins/rdp/vinagre-rdp-tab.c
-index 02f5e4e..770fe99 100644
---- a/plugins/rdp/vinagre-rdp-tab.c
-+++ b/plugins/rdp/vinagre-rdp-tab.c
-@@ -27,7 +27,6 @@
- #include <freerdp/api.h>
- #include <freerdp/types.h>
- #include <freerdp/freerdp.h>
--#include <freerdp/utils/event.h>
- #include <freerdp/gdi/gdi.h>
- #if HAVE_FREERDP_1_1
- #include <freerdp/locale/keyboard.h>
-@@ -363,7 +362,15 @@ frdp_post_connect (freerdp *instance)
-   rdpGdi               *gdi;
-   int                   stride;
- 
--  gdi_init (instance, CLRBUF_24BPP, NULL);
-+  gdi_init (instance,
-+#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \
-+    !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && \
-+    FREERDP_VERSION_MINOR >= 2))
-+                    CLRBUF_24BPP,
-+#else
-+                    CLRBUF_32BPP,
-+#endif
-+                    NULL);
-   gdi = instance->context->gdi;
- 
-   instance->update->BeginPaint = frdp_begin_paint;
diff --git a/net-misc/vinagre/metadata.xml b/net-misc/vinagre/metadata.xml
index f796c7b..4708913 100644
--- a/net-misc/vinagre/metadata.xml
+++ b/net-misc/vinagre/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
-	<use>
-		<flag name="rdp">Enable access to Windows RDP protocol using
+  <herd>gnome</herd>
+  <use>
+    <flag name="rdp">Enable access to Windows RDP protocol using
 			<pkg>net-misc/rdesktop</pkg></flag>
-		<flag name="ssh">Enable ssh plugin using <pkg>x11-libs/vte</pkg></flag>
-		<flag name="spice">Enable access to SPICE-enabled virtual machines</flag>
-		<flag name="telepathy">Enable access to remote desktop via a
+    <flag name="ssh">Enable ssh plugin using <pkg>x11-libs/vte</pkg></flag>
+    <flag name="spice">Enable access to SPICE-enabled virtual machines</flag>
+    <flag name="telepathy">Enable access to remote desktop via a
 			<pkg>net-libs/telepathy-glib</pkg> client</flag>
-	</use>
+  </use>
 </pkgmetadata>
diff --git a/net-misc/vinagre/vinagre-3.14.3.ebuild b/net-misc/vinagre/vinagre-3.14.3.ebuild
deleted file mode 100644
index 42260a8..0000000
--- a/net-misc/vinagre/vinagre-3.14.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-3.14.3.ebuild,v 1.1 2014/12/23 23:08:46 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION=0.18
-
-inherit gnome2 vala eutils
-
-DESCRIPTION="VNC client for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="avahi rdp +ssh spice +telepathy"
-
-# cairo used in vinagre-tab
-# gdk-pixbuf used all over the place
-RDEPEND="
-	>=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-3.9.6:3
-	app-crypt/libsecret
-	>=dev-libs/libxml2-2.6.31:2
-	>=net-libs/gtk-vnc-0.4.3[gtk3]
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-themes/hicolor-icon-theme
-
-	avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
-	rdp? ( net-misc/freerdp )
-	ssh? ( >=x11-libs/vte-0.20:2.91 )
-	spice? (
-		app-emulation/spice-protocol
-		>=net-misc/spice-gtk-0.5[gtk3] )
-	telepathy? (
-		dev-libs/dbus-glib
-		>=net-libs/telepathy-glib-0.11.6 )
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	$(vala_depend)
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/freerdp-1.2.0.patch"
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
-	gnome2_src_configure \
-		$(use_with avahi) \
-		$(use_enable rdp) \
-		$(use_enable ssh) \
-		$(use_enable spice) \
-		$(use_with telepathy) \
-		ITSTOOL=$(type -P true)
-}