# HG changeset patch
# User Da Risk <da_risk@geekorum.com>
# Date 1410731442 -7200
# Node ID c613325c9ed7614c2b02fe93cec53d48f4ce8c03
# Parent  cf5de03e4124bfbee65eb57f06a825a51e1f4d6e# Parent  8710e94a4528a16015ffc39a0273b444fd98d2b2
Merge add media-video/lm live ebuild

diff -r 8710e94a4528 -r c613325c9ed7 app-misc/pycarddav/Manifest
--- a/app-misc/pycarddav/Manifest	Sun Aug 03 15:42:48 2014 +0200
+++ b/app-misc/pycarddav/Manifest	Sun Sep 14 23:50:42 2014 +0200
@@ -1,1 +1,2 @@
 DIST pyCardDAV-0.6.1.tar.gz 34158 SHA256 32e223ccd7b243024f9d8da46b6f97350d520e204c5b80f8266698c1071e38e0 SHA512 a55dc8a265be03533f17b4698e797f679ed46e8860cfa4c140f753a2719b2e8d69978aa6a86ab87b622d5be5ddd015c3301d9433564c8ef4cb5eee53543740d8 WHIRLPOOL 496227084e90bbe1b1d1d368a2ba7339facd268239c9ae70b8774b4dc17efb19a0d13b3a4a4982c9875ff3cd86b9b3ab3bb1bb4dcc27ac34c723e9dbf6209a51
+DIST pyCardDAV-0.7.0.tar.gz 36462 SHA256 c5fb53bb8cab84a0517878a4218c1a704adcffa239c8ebdb2d5ecabbe7cf2434 SHA512 342e9e084fcda5e0ee7f5b2085767f306bb34f5ebf4fb3e2a39fc65986d0217f79fbfc244c69cc91d817a0945e9ddb819ec7c7067c93268f5f1ddac23ae6c10b WHIRLPOOL e98bfda1c25f65d16a68156f363958bdcb4d048465b6dff29371cb1baf720b8a926025f8ec029648c2cc3121ca37d3303a6148e67f1f801586c2bc230a04f68b
diff -r 8710e94a4528 -r c613325c9ed7 app-misc/pycarddav/pycarddav-0.6.1.ebuild
--- a/app-misc/pycarddav/pycarddav-0.6.1.ebuild	Sun Aug 03 15:42:48 2014 +0200
+++ b/app-misc/pycarddav/pycarddav-0.6.1.ebuild	Sun Sep 14 23:50:42 2014 +0200
@@ -26,8 +26,7 @@
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/urwid[${PYTHON_USEDEP}]
 	dev-python/vobject[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	virtual/python-argparse"
+	dev-python/pyxdg[${PYTHON_USEDEP}] "
 RDEPEND="${DEPEND}"
 
 DOCS=( pycard.conf.sample README.rst )
diff -r 8710e94a4528 -r c613325c9ed7 app-misc/pycarddav/pycarddav-0.7.0.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-misc/pycarddav/pycarddav-0.7.0.ebuild	Sun Sep 14 23:50:42 2014 +0200
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+PYTHON_REQ_USE="sqlite"
+
+PYTHON_COMPAT=( python2_6 python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A CardDAV based address book tool"
+HOMEPAGE="http://lostpackets.de/pycarddav/"
+SRC_URI="https://lostpackets.de/pycarddav/downloads/pyCardDAV-${PV}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+IUSE=""
+
+S=$WORKDIR/pyCardDAV-$PV
+
+DEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/vobject[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( pycard.conf.sample README.rst )
+
+pkg_postinst() {
+	ewarn "Copy and edit the supplied pycard.conf.sample file"
+	ewarn "(default location is ~/.pycard/pycard.conf)."
+	ewarn "Beware that only you can access this file,"
+	ewarn "if you have untrusted users on your machine,"
+	ewarn "since the password is stored in cleartext."
+}
diff -r 8710e94a4528 -r c613325c9ed7 etc/sets/basic
--- a/etc/sets/basic	Sun Aug 03 15:42:48 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-app-editors/vim
-app-misc/tmux
-app-shells/zsh
-net-ftp/lftp
-sys-apps/less
-sys-process/htop
-sys-process/lsof
diff -r 8710e94a4528 -r c613325c9ed7 etc/sets/desktop
--- a/etc/sets/desktop	Sun Aug 03 15:42:48 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-app-editors/gvim
-app-text/zathura
-app-text/zathura-djvu
-app-text/zathura-pdf-poppler
-app-text/zathura-ps
-dev-libs/mpc
-dev-lua/luasocket
-lxde-base/lxappearance
-mail-client/mutt
-media-gfx/mirage
-media-gfx/shotwell
-media-sound/gmpc
-media-sound/mpd
-media-sound/ncmpcpp
-media-video/mplayer2
-net-im/gajim
-sys-fs/ntfs3g
-www-client/firefox
-x11-base/xorg-x11
-x11-misc/numlockx
-x11-misc/pcmanfm
-x11-misc/slim
-x11-misc/xautolock
-x11-plugins/vicious
-x11-themes/gentoo-xcursors
-x11-terms/rxvt-unicode
-x11-themes/echo-icon-theme
-x11-themes/gentoo10-backgrounds
-x11-themes/gtk-engines-murrine
-x11-wm/awesome
diff -r 8710e94a4528 -r c613325c9ed7 etc/sets/devtools
--- a/etc/sets/devtools	Sun Aug 03 15:42:48 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-app-editors/vim
-app-editors/gvim
-
-dev-java/icedtea
-dev-java/ant
-dev-util/android-sdk-update-manager
-dev-util/checkstyle
-dev-util/meld
-dev-util/valgrind
-dev-vcs/git
-dev-vcs/hg-git
-dev-vcs/mercurial
diff -r 8710e94a4528 -r c613325c9ed7 etc/sets/sysbase
--- a/etc/sets/sysbase	Sun Aug 03 15:42:48 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-app-portage/eix
-app-portage/gentoolkit
-app-portage/layman
-sys-apps/iproute2
-sys-apps/mlocate
-sys-power/acpi
-sys-power/acpid