fix pycarddav dependency, add ympd

6 files changed, 44 insertions, 3 deletions

diff --git a/app-misc/pyCardDAV/Manifest b/app-misc/pyCardDAV/Manifest
index 75310ec..a730eff 100644
--- a/app-misc/pyCardDAV/Manifest
+++ b/app-misc/pyCardDAV/Manifest
@@ -1,6 +1,6 @@
 DIST pyCardDAV-0.5.1.tar.gz 31263 SHA256 d68128eb873c79ae6f43ba5672c7d4a3b51ea5714360f395cb0eb44ed837cddd SHA512 45e719dce9123aa39382d5da61e18fcc5adeae178ac188f1e393e5736ac33564227ff6ef289d628649d251f0835bea1b75f370fc9f26b5217e88585f9630a8ec WHIRLPOOL 7800f3382cf3727f8466df06c88bfe70aea7d8ffaac20fa79414b69b699572c477acf5272eab123290130385684ac95e28879e21141da2159559b9496cb25fcc
 DIST pyCardDAV-0.6.1.tar.gz 34158 SHA256 32e223ccd7b243024f9d8da46b6f97350d520e204c5b80f8266698c1071e38e0 SHA512 a55dc8a265be03533f17b4698e797f679ed46e8860cfa4c140f753a2719b2e8d69978aa6a86ab87b622d5be5ddd015c3301d9433564c8ef4cb5eee53543740d8 WHIRLPOOL 496227084e90bbe1b1d1d368a2ba7339facd268239c9ae70b8774b4dc17efb19a0d13b3a4a4982c9875ff3cd86b9b3ab3bb1bb4dcc27ac34c723e9dbf6209a51
 EBUILD pyCardDAV-0.5.1.ebuild 938 SHA256 6ca1f594194e1202530c5d089465b38e5e91a9470f6a5fad533131affda1c476 SHA512 4a0d36d5c10f89e360c3fba3d413e54eb763ab943055c1e6bfa874c8d4f1414b05cce95c42aa8a9d5840edbb216833b71d09195905b4522446a0740ae0d07d75 WHIRLPOOL 4d033ab04489ed008ef768658ad6fa986f6663518817cdecd752e8ca0b97e19d59809ad5bfb9eee6b539d55f3c609e4e713506784174f22bcde949b087a9acea
-EBUILD pyCardDAV-0.6.1.ebuild 938 SHA256 6ca1f594194e1202530c5d089465b38e5e91a9470f6a5fad533131affda1c476 SHA512 4a0d36d5c10f89e360c3fba3d413e54eb763ab943055c1e6bfa874c8d4f1414b05cce95c42aa8a9d5840edbb216833b71d09195905b4522446a0740ae0d07d75 WHIRLPOOL 4d033ab04489ed008ef768658ad6fa986f6663518817cdecd752e8ca0b97e19d59809ad5bfb9eee6b539d55f3c609e4e713506784174f22bcde949b087a9acea
+EBUILD pyCardDAV-0.6.1.ebuild 958 SHA256 afcb497b3982f724e7417148539388bbaa382a10fcf3e7581c94c9e8a3282a5f SHA512 6f6f43a8820c526c7c31e98ca3d7aa46f02789d2717175c7bd657002ac642d0da37df6e1b19fc1e706259d52a43bdc3d55122e0bf3417e270d4ee58d75e2b4d8 WHIRLPOOL 3b38f519bd1ffdd3b24bfcab3904a298a55947d09f7d3a4b317042f85cb572d5cf8050ec4e7f84688e42cf9b02ce30c3d65480e4842eb674e8ef88afb71513d6
 MISC ChangeLog 938 SHA256 cfb1ec02a7ad44053aefc9953e6f7de26b7627ee20f133dcd4c525c33fd5346f SHA512 25d63d5027c1099c37d11ca196cfd6ff62668d08e9205649b76f60a9059297abd4e3d10f53aae054c8fa2275c39d2078bc384ff2d0f7fa3f9810710d68770014 WHIRLPOOL 8837aef640d670776ba2bd7dc19d8d9a1f339c471905942df6ad8bfae46869eb9508817595695cfbf1e4b190894a948f3c7ef5e37c51d2bb2fffc0df10ef8b3f
 MISC metadata.xml 208 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82 SHA512 21d90d4547c76c80e50e134359dfbec42b158bbc16e4741738bdde5f67b7926d158dae1905948a477405b74e754ce4ed63cad910f220a709db8dfccf160e5288 WHIRLPOOL 33ec53f42c7a8c4c419989bd94e083c417574463e19c9c1322e6b96d0f5a6a52e3dd69fbedf2d11a7a77d24a93b81f3a604b6b33cac62548389537bf3e42df0e
diff --git a/app-misc/pyCardDAV/pyCardDAV-0.6.1.ebuild b/app-misc/pyCardDAV/pyCardDAV-0.6.1.ebuild
index 55ddb1a..7585729 100644
--- a/app-misc/pyCardDAV/pyCardDAV-0.6.1.ebuild
+++ b/app-misc/pyCardDAV/pyCardDAV-0.6.1.ebuild
@@ -24,7 +24,8 @@ DEPEND="dev-python/lxml
 	dev-python/urwid
 	dev-python/vobject
 	dev-python/pyxdg
-	virtual/python-argparse"
+	virtual/python-argparse
+	dev-python/keyring"
 RDEPEND="${DEPEND}"
 
 EXAMPLES=( pycard.conf.sample )
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 41e6361..3b8012f 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,2 +1,2 @@
 EBUILD libwebsockets-1.23.ebuild 743 SHA256 a55144abb2ebcd52bc633727b93f4e6cf5b2451571b4dae833d22a3ed9b57b85 SHA512 6e68b3245968a2d8515ee9e35640c413e799f7730059d451b8f66d5f5268be6fdd87e3f0fe74758f3b59b63311f61333151af0fe153ba0653025325660caaaf6 WHIRLPOOL ae1f8cdf5bd9c8efda9ca199deaf9c235d9b5dcd420e0cccc5e43ffe0222299de3673d0c126ad851a2fc0047c72194936603fcfd9b6f4362bd76782dbf957c9e
-EBUILD libwebsockets-9999.ebuild 743 SHA256 a55144abb2ebcd52bc633727b93f4e6cf5b2451571b4dae833d22a3ed9b57b85 SHA512 6e68b3245968a2d8515ee9e35640c413e799f7730059d451b8f66d5f5268be6fdd87e3f0fe74758f3b59b63311f61333151af0fe153ba0653025325660caaaf6 WHIRLPOOL ae1f8cdf5bd9c8efda9ca199deaf9c235d9b5dcd420e0cccc5e43ffe0222299de3673d0c126ad851a2fc0047c72194936603fcfd9b6f4362bd76782dbf957c9e
+EBUILD libwebsockets-9999.ebuild 746 SHA256 59bc1fe1b2b64092ebaa4f09e16ac6428b5f2ff34c8105476c889b73bf7e34a4 SHA512 0b9b150535042add08f646289e6037488a17accd641eef9fb0dbd4bb311f21640b4905298fbac55ce03e671577000e9f6836369cb5e25dd7dc71bdf7d98ca000 WHIRLPOOL 3a4234f2985449541e5a9c89f8d7353a6d37934349eefe03f421e2994a3de433654369f169e111f531824f8a77ff7af1eb6418053483a02b7fb48a7bf1763823
diff --git a/www-apps/ympd/Manifest b/www-apps/ympd/Manifest
new file mode 100644
index 0000000..7009bd1
--- /dev/null
+++ b/www-apps/ympd/Manifest
@@ -0,0 +1,3 @@
+DIST v1.0.0.tar.gz 212980 SHA256 b19bf83546608d07798eae96a0166cf068c5d4ccd2f1c8ffce775e68cea846f9 SHA512 dce92b894e6e382e659085ca8304c9d3beb0157e40b404341ace29ebbd973f6697127da2aa79242d057553732fb1f5a7eb6258cd79f104cc9359a7dbe31d1b36 WHIRLPOOL 6238daa9b6cdc222320da4e22ca4abc5cdc0134bb1beb6d219dd0c452d113e406d4c8494b371463a50375e9ffb1cdd95cd98eecf148704ee4229d79a439deee2
+EBUILD ympd-1.0.0.ebuild 590 SHA256 2e7873fea0934aaade3a01c6fcea8863058f9f3086828382121d7485d2cec7b7 SHA512 8bfb9ab6ca48502063068ae2f639a591eb0c19aa575289b160b1082067a6957d8fab71e687b159ca4d4edcedfa9396e7b33cba480f7148bccdff042be4cb25c9 WHIRLPOOL 04aeed6ab5b52350010ccb7e94580e382d7e41ae77ed74e92c8c7cc29275f072d9ea8d619ddc514f44fcac0e222c383d881cd603ee607733cb153207656ddca5
+MISC metadata.xml 495 SHA256 45ba8f508f3f02dbd5d860965863d1bfed00f2b1ff52f267745f2e1e630f7ccd SHA512 eebc78bb3e8ce3f69dc5ebe6f4a771a415b6824e606e6c8ec4cfe52ee9e0be76d82da93f80c578fadc78c8107a73d69b41ccda96e21672fa4589bb13f4a27ee6 WHIRLPOOL a944c9b24427d1aeba35cd6900c1d5b4b732ec80138b99ea91b4688b82b2d040455c31ab219712e6b549d501b3c5a71e585725408404401c5ebdf00363f58510
diff --git a/www-apps/ympd/metadata.xml b/www-apps/ympd/metadata.xml
new file mode 100644
index 0000000..40c878f
--- /dev/null
+++ b/www-apps/ympd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <longdescription lang="en">
+    ympd is a lightweight MPD (Music Player Daemon) web client that runs without a dedicated webserver or interpreters like PHP, NodeJS or Ruby. It's tuned for minimal resource usage and requires only very litte dependencies.
+  </longdescription>
+  <use>
+    <flag name='static'>Link libwebsockets statically</flag>
+  </use>
+</pkgmetadata>
+
diff --git a/www-apps/ympd/ympd-1.0.0.ebuild b/www-apps/ympd/ympd-1.0.0.ebuild
new file mode 100644
index 0000000..63f9f1d
--- /dev/null
+++ b/www-apps/ympd/ympd-1.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="MPD Web GUI - written in C, utilizing Websockets and Bootstrap/JS"
+HOMEPAGE="http://www.ympd.org"
+SRC_URI="https://github.com/notandy/${PN}/archive/v${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="static openssl"
+
+DEPEND=">=net-libs/libwebsockets-9999[openssl?]"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with static STATIC_WEBSOCKETS)
+	)
+	cmake-utils_src_configure
+}