# HG changeset patch
# User Da Risk <da_risk@geekorum.com>
# Date 1429520653 -7200
# Node ID 0856afb2fffe3741f1df11aa3f2a127c147868a7
# Parent  85410e9238de5934f0a9e5900005d932e62d3278# Parent  79c2d2c60aa92e3b6c10ee2dc90ca76a2890d28b
Merge bump dev-util/android-studio-1.1 into master

diff -r 79c2d2c60aa9 -r 0856afb2fffe dev-python/notify2/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-python/notify2/Manifest	Mon Apr 20 11:04:13 2015 +0200
@@ -0,0 +1,1 @@
+DIST notify2-0.3.tar.gz 8798 SHA256 684281f91c51fc60bc7909a35bd21d043a2a421f4e269de1ed1f13845d1d6321 SHA512 3290a5ff291d5500bcf631094fcf10302b234353eb8c26b91e7cd264238443866aadc15224d51eb6608e16b7ffbc9316d4bc551e5ad9de2a48b12a31b195739f WHIRLPOOL f28d569baafecaad0b2bf42856c67371ac42660dd6259a91b1d06bbcd0da15c0cfe0a87d72c2171cc23f01cacb104b633c4c386178760441ebcc8c58b32407f9
diff -r 79c2d2c60aa9 -r 0856afb2fffe dev-python/notify2/metadata.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-python/notify2/metadata.xml	Mon Apr 20 11:04:13 2015 +0200
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>da_risk@geekorum.com</email>
+		<name>Frederic Barthelery</name>
+	</maintainer>
+</pkgmetadata>
+
diff -r 79c2d2c60aa9 -r 0856afb2fffe dev-python/notify2/notify2-0.3.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-python/notify2/notify2-0.3.ebuild	Mon Apr 20 11:04:13 2015 +0200
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="Python interface to D-Bus notifications"
+HOMEPAGE="https://bitbucket.org/takluyver/pynotify2"
+SRC_URI="mirror://pypi/n/${PN}/${PN}-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff -r 79c2d2c60aa9 -r 0856afb2fffe dev-python/pafy/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-python/pafy/Manifest	Mon Apr 20 11:04:13 2015 +0200
@@ -0,0 +1,1 @@
+DIST v0.3.66.tar.gz 51716 SHA256 5b86a7562227d7b0f510d8c8057ff3a877298906d75199712941390ce8f9b094 SHA512 1f7c9f1d18c5e026f3126001126488d500347f8b48743895d9d2228190fc54bdab7bd6d40be8727e29c3788006bdd5ad415752ba222299566643a88d113fed9e WHIRLPOOL d7e7a7cbc6f3dc79e7c365cfd37efd67e5d44065f36e1fe2269f6ef1525ae20a978032296fba4f771265d035c1730235e1b24d657b48ba73a657d1fbf7d45a33
diff -r 79c2d2c60aa9 -r 0856afb2fffe dev-python/pafy/pafy-0.3.66.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-python/pafy/pafy-0.3.66.ebuild	Mon Apr 20 11:04:13 2015 +0200
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_1,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python API for YouTube"
+HOMEPAGE="http://np1.github.io/pafy/"
+SRC_URI="https://github.com/np1/${PN}/archive/v${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff -r 79c2d2c60aa9 -r 0856afb2fffe dev-util/vera++/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-util/vera++/Manifest	Mon Apr 20 11:04:13 2015 +0200
@@ -0,0 +1,1 @@
+DIST vera++-1.2.1.tar.gz 72539 SHA256 99b123c8f6d0f4fe9ee90397c461179066a36ed0d598d95e015baf2d3b56956b SHA512 324849eb541edf9e74005e324eeade2c31f8fc55567d2e08b6f7df4ecf3a6855a52f20ecec53d3f54631548c03ae67b83cc9d7a56b651e27a8460aaca70371d4 WHIRLPOOL 16fcebbc56f6dd5da2c1c9b6fdd635c6c9e72698474ddba1aa4104c70f5f018c0682790edf3f0eed7bf43a09e76bfdf405bdb2ef28e40f113d6f1eb4794b3f29
diff -r 79c2d2c60aa9 -r 0856afb2fffe dev-util/vera++/metadata.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-util/vera++/metadata.xml	Mon Apr 20 11:04:13 2015 +0200
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>tamino@cdauth.eu</email>
+		<name>Tamino Dauth</name>
+	</maintainer>
+	<longdescription lang="en">
+		Programmable tool for verification, analysis and transformation of C++ source code.
+	</longdescription>
+</pkgmetadata>
diff -r 79c2d2c60aa9 -r 0856afb2fffe dev-util/vera++/vera++-1.2.1.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-util/vera++/vera++-1.2.1.ebuild	Mon Apr 20 11:04:13 2015 +0200
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+inherit cmake-utils
+
+DESCRIPTION="Programmable tool for verification, analysis and transformation of C++ source code"
+HOMEPAGE="http://bitbucket.org/verateam"
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+SRC_URI="http://bitbucket.org/verateam/vera/downloads/${P}.tar.gz"
+
+DEPEND="${RDEPEND}"
+RDEPEND="
+	dev-lang/tcl
+	dev-libs/boost
+	doc? ( app-text/pandoc )
+	"
+MERGE_TYPE="source"
diff -r 79c2d2c60aa9 -r 0856afb2fffe mail-filter/spamassassin-mailman/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mail-filter/spamassassin-mailman/Manifest	Mon Apr 20 11:04:13 2015 +0200
@@ -0,0 +1,1 @@
+DIST spamassassin-mailman-0.1.tar.bz2 3328 SHA256 0606136d5c386a9b30fed0330c1297ff4f97ff15ab6fa3fce5f679e142e715eb SHA512 831d53c3c2ddbb813df68ae0395b63c656bea8e4985b3c4cfe7c457d54ead9dffe2d8a8e087bacc796b9efdab1e285e59b449511af83dc0bc891fe9b4b0bca2d WHIRLPOOL ce10f090cb060e6283078ff85ef4f42974d984b5b129b440a53cd9d6cc9c739cd7861c4b74075ddec6119dfe5b96e59f45ded2fed056ee5baa35caad9b21b7bc
diff -r 79c2d2c60aa9 -r 0856afb2fffe mail-filter/spamassassin-mailman/metadata.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mail-filter/spamassassin-mailman/metadata.xml	Mon Apr 20 11:04:13 2015 +0200
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>da_risk@geekorum.com</email></maintainer>
+</pkgmetadata>
diff -r 79c2d2c60aa9 -r 0856afb2fffe mail-filter/spamassassin-mailman/spamassassin-mailman-0.1.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mail-filter/spamassassin-mailman/spamassassin-mailman-0.1.ebuild	Mon Apr 20 11:04:13 2015 +0200
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="Integrates spamassassin filters into mailman"
+HOMEPAGE="http://www.jamesh.id.au/articles/mailman-spamassassin/"
+SRC_URI="http://tinyrss.elyzion.net/~darisk/files/soft/spamassassin-mailman-0.1.tar.bz2"
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit python-single-r1
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+		${PYTHON_DEPS}
+		mail-filter/spamassassin
+		net-mail/mailman"
+
+src_install() {
+	insinto /usr/lib/mailman/Mailman/Handlers/
+	doins SpamAssassin.py spamd.py
+	python_optimize "${D}/usr/lib/mailman/Mailman/Handlers/"
+}
+
+pkg_postinst() {
+	elog "This package just install needed files to integrate mailman and SpamAssassin"
+	elog "See http://www.jamesh.id.au/articles/mailman-spamassassin/ for more informations"
+}
diff -r 79c2d2c60aa9 -r 0856afb2fffe media-sound/mps-youtube/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-sound/mps-youtube/Manifest	Mon Apr 20 11:04:13 2015 +0200
@@ -0,0 +1,1 @@
+DIST v0.2.0.tar.gz 58653 SHA256 96d83868dc19a916119772ca00378b2a500a70eaedf9f217c508c673cd1e3f17 SHA512 565f928a2412db8f0ed3d3339da2379f25e8d0a9b2b4e6b65d80f6e6be4ae394061214a735bdcbff5fe7e70b52ba189acd1de0d20d5475d57afa3cfd17b79c86 WHIRLPOOL 6485f29d8f2218b28b9e41e3e7fa2531b116935e5d29e49e700410dcede9cdb3be8cc3b1e1f11e2c670bc465a1725dbd8d96957381bcb583394c61cd8946f11b
diff -r 79c2d2c60aa9 -r 0856afb2fffe media-sound/mps-youtube/mps-youtube-0.2.0.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-sound/mps-youtube/mps-youtube-0.2.0.ebuild	Mon Apr 20 11:04:13 2015 +0200
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_1,3_2,3_3} )
+
+inherit distutils-r1
+
+EGIT_REPO_URI="git://github.com/np1/mps-youtube.git"
+
+DESCRIPTION="Terminal based YouTube jukebox with playlist management"
+HOMEPAGE="https://github.com/np1/mps-youtube"
+SRC_URI="https://github.com/np1/${PN}/archive/v${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="|| ( media-video/mplayer media-video/mplayer2 media-video/mpv )
+		>=dev-python/pafy-0.3.66"