# HG changeset patch
# User gsnerf <gsnerf@gsnerf.de>
# Date 1385304791 -3600
# Node ID a33147feba0f82c9c2f2a67efb3f62bbc4e70485
# Parent  eb18995b21f7a45aa5ef632904aca0aba7028b1a# Parent  e1ae18b48ffd14f0271edd4812746718bd236283
merge

diff -r eb18995b21f7 -r a33147feba0f kde-misc/py-cashew/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kde-misc/py-cashew/Manifest	Sun Nov 24 15:53:11 2013 +0100
@@ -0,0 +1,2 @@
+EBUILD py-cashew-1.1-r1.ebuild 921 SHA256 e342279ba6341cb2cdc4423e3a44c7ba694aa2a1e852ec8ffc0c5e31b8f37542 SHA512 e7ea89a2a39e47a83133a70b1338c7ed647a958a420199412e24eca46f1995d6ca71b195a7c7e3c397ec3fecb27a142d8b99e8151b932bb880192497a68abad3 WHIRLPOOL 1e651eafba1198e7eabafedf1e2fe989408dce580fb62e0269d4a6986f392652e96b6ee539ed8e6a4a748767fc49712a82e06487624736d62ea525592a0171f1
+EBUILD py-cashew-1.2.ebuild 1336 SHA256 a1e7a9b3046fb5d7480420ff1747fd2367abd8eafa608807b38f50d06f09bf7c SHA512 723d18cc3fb19a34c98a2a4ea3a63941965c4f6a5278a70bb564cba16986aee16a71364b48ec49dcbb699abe2a6da054ad9cb45137823e55d83d3f4be982cc9a WHIRLPOOL d1489aafaba115b6e6372a910a784aa0ced98ae50f92bee27180b572025c044276ac0a7d79c035a346649670d1ad8bb59cf11ecc5ef3300f1f5d4cb56b99e59d
diff -r eb18995b21f7 -r a33147feba0f kde-misc/py-cashew/py-cashew-1.2.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kde-misc/py-cashew/py-cashew-1.2.ebuild	Sun Nov 24 15:53:11 2013 +0100
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Plasmoid for KDE 4.6+ to remove the so-called Cashew (desktop configuration icon) - replacement for abandoned plasmoid \"I HATE the cashew\"."
+HOMEPAGE="http://kde-look.org/content/show.php/Py-Cashew?content=147892"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+inherit git-2
+#inherit kde4-base
+
+EGIT_REPO_URI="https://github.com/benoit-monin/Py-Cashew.git"
+EGIT_COMMIT="226e0352785f14323f787b65a3673abf4b8ce4f2"
+
+#src_unpack() {
+#	cd ${WORKDIR}
+#	git clone ${EGIT_REPO_URI} py-cashew-1.2
+#	cd py-cashew-1.2
+#	git checkout -b TMP-ebuild ${EGIT_COMMIT}
+#	cd ..
+#}
+
+#pkg_postinst() {
+#	plasmapkg --packageroot /usr/share/apps/plasma/plasmoids -i py-cashew-1.2.plasmoid
+#}
+
+src_install() {
+	# we try to mimic plasmapkg which does not work in sandbox
+	
+	insinto /usr/share/apps/plasma/plasmoids/py-cashew
+	doins metadata.desktop
+	
+	# no idea where icons should go, nothing seems to fit PNGs...
+	#insinto /usr/share/apps/desktoptheme/default/icons/
+	#doins py-cashew.png
+
+	insinto /usr/share/apps/plasma/plasmoids/py-cashew/contents/code
+	doins contents/code/main.py
+	
+	cp -a metadata.desktop plasma-applet-py-cashew.desktop
+	insinto /usr/share/kde4/services
+	doins plasma-applet-py-cashew.desktop
+}
diff -r eb18995b21f7 -r a33147feba0f media-gfx/trimage/Manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-gfx/trimage/Manifest	Sun Nov 24 15:53:11 2013 +0100
@@ -0,0 +1,1 @@
+EBUILD trimage-1.0.5.ebuild 1091 SHA256 7c4da03a2959f9d053109657ef813becd80cc3320c535ac19ebd43304a6b6cab SHA512 e2f72be17bd53944b978bd58ad0d08acd4a0e0b7f54557f7d8db666e8e2b9de0cf9fa45d3043039b71b1c9d344cb20656b7b413a82744c73a43b2f97afe4ebc0 WHIRLPOOL eb9badb7c17fbe2a4f5065ef81b325e2e975c64b4da1c06225399ac68c93649eb6d46fe6346ab67734a467d41d313432410b845b0f4f02a14bd018d526bd6e67
diff -r eb18995b21f7 -r a33147feba0f media-gfx/trimage/trimage-1.0.5.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-gfx/trimage/trimage-1.0.5.ebuild	Sun Nov 24 15:53:11 2013 +0100
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{ 2_6, 2_7 } )
+
+
+inherit git-2
+inherit distutils
+
+DESCRIPTION="GUI for PNG and JPEG optimization via optipng, pngcrush, advpng and jpegoptim"
+HOMEPAGE="http://trimage.org/"
+
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/Kilian/Trimage.git"
+EGIT_COMMIT="e460faca7635f52d7e530b80835a847778e7eeac"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# dependencies specified on homepage are outdated (no longer in portage at the time of
+# writing) but slightly newer ones shouldn't be a problem.
+#
+# Original requirements for 1.0.5:
+#   python 2.6
+#   python-qt4 4.4
+#   optipng 0.6.2.1
+#   pngcrush 1.6.7
+#   advancecomp 1.15
+#   jpegoptim 1.2.2
+#
+DEPEND="
+	>=dev-python/PyQt4-4.4
+	<dev-python/PyQt4-4.11
+	
+	>=media-gfx/optipng-0.6.2.1
+	<media-gfx/optipng-0.8
+	
+	>=media-gfx/pngcrush-1.6.7
+	<media-gfx/pngcrush-1.8
+	
+	~app-arch/advancecomp-1.15[png]
+	
+	>=media-gfx/jpegoptim-1.2.2
+	<media-gfx/jpegoptim-1.3
+"
diff -r eb18995b21f7 -r a33147feba0f media-video/qt-faststart-python/Manifest
--- a/media-video/qt-faststart-python/Manifest	Sun Nov 24 15:52:29 2013 +0100
+++ b/media-video/qt-faststart-python/Manifest	Sun Nov 24 15:53:11 2013 +0100
@@ -1,1 +1,2 @@
-EBUILD qt-faststart-python-20111101.ebuild 688 RMD160 9f5e8ec26e8bbdfbb2864e56e579c7f6a00d403c SHA1 72b7a427f6718a9ae734eeb293f6f454329d82f8 SHA256 8735c32c47175c2929ee264fdf4598174acca7876fc3e427ed405ea2406ddd76
+EBUILD qt-faststart-python-1.6.ebuild 688 SHA256 8735c32c47175c2929ee264fdf4598174acca7876fc3e427ed405ea2406ddd76 SHA512 bec4c2ec36cb787eb00138b3f4215eff39420aa02a63b614d219af5d8dafc8d185497d24bb072bec7f5b66cde3dd76c2cd66a41cc9f4b2c3743e20d235bbd2cc WHIRLPOOL 20a93e93ac56c85ef5c109076a47cbc660358be8d0525a2b024d7b4cad40053541633997e08520ecdef41e2dda95ad2e84aa56ddbbaed17f7d6af719f3535c21
+EBUILD qt-faststart-python-1.8.0.ebuild 688 SHA256 de57b88716bcd1535a40d841039a6e1011b2481f55ff4e92ea8e7a0c8a3a4ec0 SHA512 25d1d31902126ada48c2f695cdeecf9f9451bf3bd6d820918fb5c78bb5032a0635acb1db6ec7b193031e959287dd91e7bb69257a701c8cf56944c75ce61f0879 WHIRLPOOL ad69e8a6e4bb204f939db48cc0174d008b6c8b219809b7c547a476371101ff84daad4760ee423082856c81318dd70ed1403fd461999387c9d7eddf571be8f0ce
diff -r eb18995b21f7 -r a33147feba0f media-video/qt-faststart-python/qt-faststart-python-1.6.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-video/qt-faststart-python/qt-faststart-python-1.6.ebuild	Sun Nov 24 15:53:11 2013 +0100
@@ -0,0 +1,29 @@
+# ebuild from gentoo-overlay.megacoffee.net, author: dneuge
+# Distributed under the terms of the GNU General Public License v2
+# feel free to use, modify and upload somewhere else without naming
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils
+inherit git-2
+
+DESCRIPTION="Quicktime atom positioning in Python for fast streaming"
+HOMEPAGE="https://github.com/danielgtaylor/qtfaststart"
+
+EGIT_REPO_URI="https://github.com/danielgtaylor/qtfaststart.git"
+EGIT_COMMIT="eb8594dd206d7ca175420aea397bba1cb8e5300f"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	distutils_src_prepare
+}
+
+src_install() {
+	distutils_src_install
+}
diff -r eb18995b21f7 -r a33147feba0f media-video/qt-faststart-python/qt-faststart-python-1.8.0.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-video/qt-faststart-python/qt-faststart-python-1.8.0.ebuild	Sun Nov 24 15:53:11 2013 +0100
@@ -0,0 +1,29 @@
+# ebuild from gentoo-overlay.megacoffee.net, author: dneuge
+# Distributed under the terms of the GNU General Public License v2
+# feel free to use, modify and upload somewhere else without naming
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils
+inherit git-2
+
+DESCRIPTION="Quicktime atom positioning in Python for fast streaming"
+HOMEPAGE="https://github.com/danielgtaylor/qtfaststart"
+
+EGIT_REPO_URI="https://github.com/danielgtaylor/qtfaststart.git"
+EGIT_COMMIT="a2649843228fb49c3a6bd0335960f70c45752e78"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	distutils_src_prepare
+}
+
+src_install() {
+	distutils_src_install
+}
diff -r eb18995b21f7 -r a33147feba0f media-video/qt-faststart-python/qt-faststart-python-20111101.ebuild
--- a/media-video/qt-faststart-python/qt-faststart-python-20111101.ebuild	Sun Nov 24 15:52:29 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# ebuild from gentoo-overlay.megacoffee.net, author: dneuge
-# Distributed under the terms of the GNU General Public License v2
-# feel free to use, modify and upload somewhere else without naming
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-inherit git-2
-
-DESCRIPTION="Quicktime atom positioning in Python for fast streaming"
-HOMEPAGE="https://github.com/danielgtaylor/qtfaststart"
-
-EGIT_REPO_URI="https://github.com/danielgtaylor/qtfaststart.git"
-EGIT_COMMIT="eb8594dd206d7ca175420aea397bba1cb8e5300f"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_prepare() {
-	distutils_src_prepare
-}
-
-src_install() {
-	distutils_src_install
-}