Merge branch 'master' of https://github.com/TheChymera/chymeric

README.md

@@ -1,12 +1,6 @@
-Chymeric Gentoo Overlay
+# Chymeric Gentoo Overlay
-======================
 
-An overlay for Gentoo, with various packages chiefly maintained by TheCyhmera:
+An overlay for Gentoo, with various packages chiefly maintained by [TheCyhmera](https://github.com/TheChymera). 
-https://github.com/TheChymera
+The repositiry sstructure is somewhat based on that of the *gentoo science overlay*, and we also use thin manifests.
 
-Please fork! We will merge!
+Please report issues via the GitHub tracking system! Please fork and submit pull requests! We're happy to merge!
-
-Ask for help under h.chr@mail.ru .
-
-Report issues on the github site:
-https://github.com/TheChymera/chymeric

media-gfx/mandelbulber/Manifest

@@ -0,0 +1 @@
+DIST mandelbulber1.12-1.tar.gz 1179684 SHA256 75376616b52cb8dac7c7f358f4eb26f9d2fb171b9b0a54dbb25eeb57e494d382 SHA512 c198c71648ad4d674dac980c77fe2573617e122bdddb7775fccf74e1a929900691a421561f8717e4df741db65421cbdb8e464fd031ff5c38a56f63f5259b5512 WHIRLPOOL 7b5113bc81913607a544d19e9d16f53ec8888f97584110d0b8ad545b4603582f88fdfab4260d9fc74feaaae815739ac14f4b42e045fa1d6ae86d0e72e52f77fa

media-gfx/mandelbulber/files/mandelbulber-1.11-qa.patch

@@ -0,0 +1,37 @@
+--- a/makefiles/makefile
++++ b/makefiles/makefile
+@@ -5,6 +5,7 @@
+ -include ../makefile.init
+ 
+ RM := rm -rf
++CXX ?= g++
+ 
+ # All of the sources participating in the build are defined here
+ -include sources.mk
+@@ -44,7 +45,7 @@
+ mandelbulber: $(OBJS) $(USER_OBJS)
+ 	@echo 'Building target: $@'
+ 	@echo 'Invoking: GCC C++ Linker'
+-	g++ -o"mandelbulber" -L/usr/lib/x86_64-linux-gnu/ $(OBJS) $(USER_OBJS) $(LIBS)  `pkg-config --libs gtk+-2.0 gthread-2.0`
++	$(CXX) $(LDFLAGS) -o"mandelbulber" -L/usr/lib/x86_64-linux-gnu/ $(OBJS) $(USER_OBJS) $(LIBS)  `pkg-config --libs gtk+-2.0 gthread-2.0`
+ 	@echo 'Finished building target: $@'
+ 	@echo ' '
+ 
+--- a/makefiles/src/subdir.mk
++++ b/makefiles/src/subdir.mk
+@@ -63,12 +63,14 @@
+ ./src/undo.d \
+ ./src/cl_support.d 
+ 
++CXX ?= g++
++CXXFLAGS ?= -O2 -fast-math
+ 
+ # Each subdirectory must supply rules for building sources it contributes
+ src/%.o: ../src/%.cpp
+ 	@echo 'Building file: $<'
+ 	@echo 'Invoking: GCC C++ Compiler'
+-	g++ -O2 -ffast-math -Wall -c -fmessage-length=0 `pkg-config --cflags gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
++	$(CXX) $(CXXFLAGS) -Wall -c -fmessage-length=0 `pkg-config --cflags gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+ 	@echo 'Finished building: $<'
+ 	@echo ' '
+ 

media-gfx/mandelbulber/files/mandelbulber-1.12.1-memcpy_and_memset.patch

@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/464972
+
+--- src/texture.cpp
++++ src/texture.cpp
+@@ -5,6 +5,7 @@
+  *      Author: krzysztof
+  */
+ #include <stdio.h>
++#include <string.h>
+ #include "texture.hpp"
+ #include "files.h"
+ 
+--- src/timeline.cpp
++++ src/timeline.cpp
+@@ -6,6 +6,7 @@
+  */
+ 
+ #include <cstdlib>
++#include <cstring>
+ 
+ #include "timeline.hpp"
+ #include "files.h"

media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild

@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild,v 1.2 2013/04/08 15:05:56 ssuominen Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs versionator
+
+MY_P=${PN}$(replace_version_separator 2 '-' )
+
+DESCRIPTION="Tool to render 3D fractals"
+HOMEPAGE="http://sites.google.com/site/mandelbulber/home"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	>=media-libs/libsndfile-1
+	>=media-libs/libpng-1.4:0=
+	virtual/jpeg"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.11-qa.patch \
+		"${FILESDIR}"/${P}-memcpy_and_memset.patch
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX)" -C makefiles all
+}
+
+src_install() {
+	dobin makefiles/${PN}
+	dodoc README NEWS
+	insinto /usr/share/${PN}
+	doins -r usr/share/*
+	domenu ${PN}.desktop
+}
+
+pkg_postinst() {
+	elog "Before you run ${PN} please copy /usr/share/${PN}/* to \${HOME}/.${PN}"
+}

media-libs/gnonlin/Manifest

@@ -0,0 +1 @@
+DIST gnonlin-1.1.90.tar.xz 402616 SHA256 b2214ee45583a4532d110e852e2aecf787cefa8fe50f44c8234fb55713feba61 SHA512 877c42f717e701538ddbfe028899d3678247ee055d0a5785610ff7eec9a5e3ab20bad5ceabe15b88a4c8907dd6de5aa88b4e1ff644aeb7f7332da59562571539 WHIRLPOOL f95475f9ff87eda1f244f7f4c796c754124ab938b523d26d681db7fd9a3273447c270038c8e5ddfb2e95e031aec252a25a0743240c0d5c0135b7704aa3fa337c

media-libs/gnonlin/gnonlin-1.1.90.ebuild

@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gnonlin/gnonlin-0.10.17.ebuild,v 1.4 2012/11/07 20:41:28 tetromino Exp $
+
+EAPI="4"
+
+DESCRIPTION="Gnonlin is a set of GStreamer elements to ease the creation of non-linear multimedia editors."
+HOMEPAGE="http://gnonlin.sourceforge.net"
+SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+     >=media-libs/gstreamer-1.0.10:1.0
+     >=media-libs/gst-plugins-base-1.0.10:1.0"
+DEPEND="${RDEPEND}
+    virtual/pkgconfig
+    doc? ( || (
+        >=dev-util/gtk-doc-am-1.13
+        >=dev-util/gtk-doc-1.3 ) )
+    test? ( dev-libs/check
+        >=media-libs/gst-plugins-good-1.0.10:1.0 )" # videomixer
+
+src_configure() {
+    econf \
+        $(use_enable doc gtk-doc) \
+        $(use_enable doc docbook)
+}
+
+src_install() {
+    emake DESTDIR="${D}" install || die "emake install failed."
+    dodoc AUTHORS ChangeLog NEWS README RELEASE
+
+    # For some reason, make install doesn't do this
+    if use doc; then
+        local htmldir="/usr/share/gtk-doc/html"
+        cd "${S}/docs/libs/html"
+        gtkdoc-rebase --html-dir=${htmldir} || die "gtkdoc-rebase failed"
+        insinto "${htmldir}/gnonlin"
+        doins "${S}"/docs/libs/html/* || die "doins docs failed"
+    fi
+}
+

media-video/pitivi/pitivi-0.92.ebuild

@@ -25,9 +25,9 @@ RESTRICT="test"
 COMMON_DEPEND="
 	>=dev-python/pygtk-2.18:2
 	dev-python/pycairo
-	>=media-libs/gstreamer-1.0.10:1
+	eix >=media-libs/gstreamer-1.0.10:1.0
-	>=dev-python/gst-python-1.1.90:1
+	>=dev-python/gst-python-1.1.90:1.0
-	>=media-libs/gnonlin-1.1.90:1
+	>=media-libs/gnonlin-1.1.90:1.0
 	>=x11-libs/gtk+-2.24.0:2
 	media-plugins/gst-editing-services"
 RDEPEND="${COMMON_DEPEND}
@@ -37,11 +37,11 @@ RDEPEND="${COMMON_DEPEND}
 	net-zope/zope-interface
 	gnome-base/librsvg:=
 
-	>=media-libs/gst-plugins-base-1.0.10:1
+	>=media-libs/gst-plugins-base-1.0.10:1.0
-	>=media-libs/gst-plugins-good-1.0.10:1
+	>=media-libs/gst-plugins-good-1.0.10:1.0
 	>=media-plugins/gst-plugins-ffmpeg-0.10:0.10
 	>=media-plugins/gst-plugins-xvideo-0.10.31:0.10
-	>=media-plugins/gst-plugins-libpng-1.0.10:1
+	>=media-plugins/gst-plugins-libpng-1.0.10:1.0
 
 	v4l? ( media-plugins/gst-plugins-v4l2:0.10 )"
 DEPEND="${RDEPEND}

net-p2p/btsync/Manifest

@@ -1,13 +1,12 @@
-AUX btsync.service 206 SHA256 92a8e752633fe3d90b8081b3989e2b1a3bb8459b6022eec3a3fedbf9215ce847 SHA512 6dc27cb1c8ac56c509c61344bbba3feaf43f76c18054b3c4357bd870f334781574771d0b92efe17c98db11c6d486f2ca991a39d3bf8e7a37da0e1d49a646477b WHIRLPOOL c6456b5b9b58b81d9099671028c34bf13b61fca73a3759569a07a84d9ec7dd0006acb491e0aa63dd73f586f7237ae27f681c4c7d32bb17651cd718f9493cbbf1
-AUX config 1817 SHA256 6b7612f6d34b0ea2c522f1bf879924a3eec1ab4ce2823dd1bf125923df835896 SHA512 edd42219782d2898bc1d472f0bc523d0a9e36fcb957ad710c23db81ca185b03227cc4fbc0305b1ad622a9fd8b5d642c5278e24964514a79dd10a2523c6416267 WHIRLPOOL b557b2c84f19426071989f3e929e818e48e7b35cf6c6e2322000e7bc0caa0d3613e295b680ed8ff89985be96ee76681378b4ed17e488ae67c07c0035dfb07950
-AUX init.d/btsync 804 SHA256 023bd5c1f36b17af6c81343279fb7a4314e9172663ed8da35fb6731ecc47cb76 SHA512 4238f89b41019fb73f5a328e05d687785d946b80694787a17ffdcc020be71df7a7751479659f82c890e674679bc5b5b4b208a9c48b8926433f9d979fab3cb983 WHIRLPOOL ab167800ebc416474614866ae9c708e8546c6abcb25dc464c95c67f4f2355ce77503f6045572c55772e8fba00a15b0db8cbcbd09dc16abae1d5eb5447c705575
 DIST btsync_arm-1.1.70.tar.gz 1279220 SHA256 d79b3cf1881fcab95614693569c950d07dd93ffb70cefd901963dec54b75a05b SHA512 321079de894170eafdd8f923f2e1bfd0909904d350b678707f67566ed0afd1ef8af333270b791d6a429774d7e454da4ef064b417be36b338de2e53599e699bd3 WHIRLPOOL f6499199eae078bc7609aa190a61800866dffbc40fcf08f1ae65456ab6ebf36123e5542b3bbff39f0e61d7ae7161d97684ebed3f091145a90e6eb0b789d3db41
 DIST btsync_arm-1.1.82.tar.gz 1287272 SHA256 c1502fb7d907caf105c7aa5403f4d575f86aa8ca57817ca90aa4ba1398181a3e SHA512 627e24495f3ee1f48f666a85df8d053f5f7ed51784c23d454410d468773c0d6251211ea188f8235b1cb3c14da20e01a5d4cfdc28b0e16de841a4c805ed2bfbe4 WHIRLPOOL 9d58ff32d68e969a64f2c51cae865b5372f69835b90855de61e927355e794d686760ddef8a651076a6bfb01e4269d15c1e2883f0910f7ac25c3c989097bdf4ed
+DIST btsync_arm-1.2.82.tar.gz 2244128 SHA256 e9f1a3aacfda8e1b5002228de134e5798ff4e0a69ca749fcde6f803c5b500885 SHA512 203806be2d7f066420b006a3eb3897a67d02fde4edef7778cbf6c17b057e8e5102aeefd08f446854fe7db0a595f2dc0468d6ea5b7d8db110a5d3fafc46656182 WHIRLPOOL 8746e9e924b48429d8847a3a190ebd5db9d9bea1b36c23a05d3e5258908741c3740c28d93d488608d3df36d7466da2d1887df30dd524e5c3bedbd9296c3efebc
 DIST btsync_i386-1.1.70.tar.gz 1367784 SHA256 25161852b8eaddf50ae385771f79bac47818467bc5cabc539a64d985e8af4dc6 SHA512 ac18a91a2d9549388541c2c7dabcae1e8b04534115d3c7e5d93b3fe984c801ebdeed931d63d59e7e7e767587fe42d2bb80e6833127b4cf475d30130314f5c864 WHIRLPOOL a5b12b32a521b7f730b8e9cd1505ac4b7ccd56f0d5f91a1988192b32a539a48380d040d6485327153051708c4d5919d517202d90aaf3c8033bdb730b72981314
 DIST btsync_i386-1.1.82.tar.gz 1375007 SHA256 1b163881631d008ea5472b1f03a49e96f2a107b9565c5d8ae48124042e3a4def SHA512 2f7f24989412945f1da18d88760e955fa55ca8e97a75e2e72e48a001e6a3d9253a7c0856e5b8dfc5bef9dcd8c405f76f1aed6f05fdb0ae7f2bdffe0c6f90a1a8 WHIRLPOOL daf2af288b1e55bd3700bfba600eab9b975ad3701cf41b921554bcc5760096c8afba90ef70a3e4972d73eaf92fd82815f0d19d36de55547529f0eba175b094bd
+DIST btsync_i386-1.2.82.tar.gz 2044500 SHA256 3a1ed93c2b27be0ca9711bd4736de3dd62d6527b1cbbbdfc0f124e0ea6b339ad SHA512 71d34dbb006ada48a51d3cb9528f62c1607d91b808cdb21b3b19b67c90fc5c85143b251dad48831941b5c93f95fba1d74e3a7a82e8b4bf2831bbfbf083c4402b WHIRLPOOL 6b65873441594bb449c50019e955a2ce6ac1fabc0fff4739f1467232b174b4c03df1cec9b29e236f1bcdef31e045640468ef681107b595434cd73c66b0e60bcf
 DIST btsync_powerpc-1.1.70.tar.gz 1451029 SHA256 7d68783020627a019363c20d776aaf017bde023886989cac4bd96528fdae9faf SHA512 7f0e22d1cf10e7ebbae78e43cbd84d4d4de2b20478a6605534ee4c04ade68b2bbdea33049a9861cfd53badc4e7e7b2ff24e35c3156d3cf62a8828300094ba5ba WHIRLPOOL ab33985672e29c69c7aaa9729c93dd35a78152fde6b64adaba8a04f93f3ef4006defe240d127e33f6f348a7b825a3ce2e642228f43beb64ecd2fb811f300bdf3
 DIST btsync_powerpc-1.1.82.tar.gz 1458242 SHA256 076f92c1b4340eb1283e053065df6156b43730c5603961eb6f127d38792aebf3 SHA512 ad96616c3b2edcb5a7829a4d9dd4d82aa3bf60d66d1c0b0f40697510786e83682c7348dd4be6ec35e553544d3ccadf08e1f5f073032995b87cfc8aa586570fe7 WHIRLPOOL 0eb2969d376b172a7550c1f050cfe55c817a1cd12282e0ec8bc95fb0f0ad860494d3afb53e328d8a482e39cf4f4d813cf9ef63d1c7dfcefbcd2728a2f9764d7c
+DIST btsync_powerpc-1.2.82.tar.gz 2188642 SHA256 d89ed515e968a9f92784b2e65ad23ff4488ea36ddc826651dce5ac78ae37d90b SHA512 85c7e9674dd85cef3587dcac29ada8dc6bc2b8ba63d70fea8924384ac15aaa0e38a6e7f85ce52b8c804dd364f1fd4c2de85d327b0bbebbf232b7b70203328e01 WHIRLPOOL abc5202f87cb3135277b9933c7b13e8558fd40b6cde5703fb849801ad60eae3694ff661a13beea7d559b6dfc6e9420c6a344e63f76452e053b1537ef5cd8819b
 DIST btsync_x64-1.1.70.tar.gz 1449204 SHA256 7197ac1a23ff593b1cc6ef124cb2555376aac4637f368483ed2e0d5230b3dec2 SHA512 768f960935cacd1ccc655e9182ada0ddf61d4b8fd0dc8a5386182a46014e6bd11f1743a78884f17b9d3b04d6668bb98c56bce8019c902a216ed26d65a60492c7 WHIRLPOOL 6261713d643ef0eb9816837975a0d0af534819cf978de8370b088c93bd86770f3053c0976e27aee32fc00b0ecf1a9a01cf083e95c1325dcd632896a6e6b5bf2c
 DIST btsync_x64-1.1.82.tar.gz 1457129 SHA256 3cefbef2af6323dfdb7ccfaad32f7d0c8ed5cb4ebbab58936a479f0c30804bbb SHA512 513048820cdfa02bf90bb731479baf84f7e43947cd3794d3d867f785ed7750b50518b5ed1f5447d78d563eaf25079669293d4da66624c0c8cc501213e1ec8808 WHIRLPOOL 7eab7873aefb8ef704082d782c2df4b3193ce9a0073e725180e3d1c4daa721d1a5110de698cfe07882351ed96ca4a87e84cc3b0ed2e8959d04aed0491a0d08cb
-EBUILD btsync-1.1.70.ebuild 1520 SHA256 7f39a79002d3d380be68804556eac5adc87688ba1d999eae4c736f503d9e908c SHA512 8dc3fb085e28ff9e3471ece1349e7e30472e0a81779148c9048c853f0a9707c5d8bf14c59a6d0d2d306f0db6fc3d91d741a1f6ad0f171364f069e32672ec496b WHIRLPOOL 5ca948cf28a3f289db013bc841a85db37e5de5bbc0ff7253e320b5420feaa6e98579b8723960de393131acf66e97f40f3f8554c350463730191bcb39a5a1ac42
+DIST btsync_x64-1.2.82.tar.gz 2218854 SHA256 2a87c4ec255b3669decb9746d54f52ec7cc3bb019e9ba7f2f9bc9fb215d31933 SHA512 e1b47e13d35080c4f1275bc671581ce13690ca30ca7bbd6ce8d3598e35c79939b9a2d20aab2c7d566d10f603758487d670081e0bec8207039f90eca881d4c526 WHIRLPOOL ea05e594378e8ba6cd4f1f2429830b04cd8e3b4ac763fc2d9fb9f76e9075a59560123ba6112fd1e55c53f2a6b9da37cb737acdcba1881006b9fff2b11b6d1d81
-EBUILD btsync-1.1.82.ebuild 1520 SHA256 7f39a79002d3d380be68804556eac5adc87688ba1d999eae4c736f503d9e908c SHA512 8dc3fb085e28ff9e3471ece1349e7e30472e0a81779148c9048c853f0a9707c5d8bf14c59a6d0d2d306f0db6fc3d91d741a1f6ad0f171364f069e32672ec496b WHIRLPOOL 5ca948cf28a3f289db013bc841a85db37e5de5bbc0ff7253e320b5420feaa6e98579b8723960de393131acf66e97f40f3f8554c350463730191bcb39a5a1ac42

net-p2p/btsync/btsync-1.1.70.ebuild

@@ -34,7 +34,7 @@ src_install() {
 	exeinto "/opt/${PN}"
 	doexe btsync
 	insinto "/etc/${PN}"
-	doins "${FILESDIR}/config"
+	doins "${FILESDIR}/btsync.conf"
 	doinitd "${FILESDIR}/init.d/${PN}"
 	cp ${FILESDIR}/btsync.service ${D}/btsync@.service
 	systemd_dounit "${D}/btsync@.service"

net-p2p/btsync/btsync-1.1.82.ebuild

@@ -34,7 +34,7 @@ src_install() {
 	exeinto "/opt/${PN}"
 	doexe btsync
 	insinto "/etc/${PN}"
-	doins "${FILESDIR}/config"
+	doins "${FILESDIR}/btsync.conf"
 	doinitd "${FILESDIR}/init.d/${PN}"
 	cp ${FILESDIR}/btsync.service ${D}/btsync@.service
 	systemd_dounit "${D}/btsync@.service"

net-p2p/btsync/btsync-1.2.82.ebuild

@@ -0,0 +1,63 @@
+# Copyright (C) 2013 Jonathan Vasquez 
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit systemd user
+
+DESCRIPTION="Automatically sync files via secure, distributed technology."
+HOMEPAGE="http://labs.bittorrent.com/experiments/sync.html"
+SRC_URI="
+	amd64?	( http://syncapp.bittorrent.com/${PV}/${PN}_x64-${PV}.tar.gz )
+	x86?	( http://syncapp.bittorrent.com/${PV}/${PN}_i386-${PV}.tar.gz )
+	arm?	( http://syncapp.bittorrent.com/${PV}/${PN}_arm-${PV}.tar.gz )
+	ppc?	( http://syncapp.bittorrent.com/${PV}/${PN}_powerpc-${PV}.tar.gz )"
+
+RESTRICT="mirror strip"
+LICENSE="BitTorrent"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+QA_PREBUILT="opt/${PN}/${PN}"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	enewgroup btsync
+}
+
+src_install() {
+	exeinto "/opt/${PN}"
+	doexe btsync
+	insinto "/etc/${PN}"
+	doins "${FILESDIR}/btsync.conf"
+	doinitd "${FILESDIR}/init.d/${PN}"
+	cp ${FILESDIR}/btsync.service ${D}/btsync@.service
+	systemd_dounit "${D}/btsync@.service"
+	mkdir ${D}/opt/${PN}/pid/
+	fowners -R root:btsync /opt/${PN}
+	fperms -R 775 /opt/${PN}
+}
+
+pkg_postinst() {
+ewarn "You have to add your user to the btsync group to use btsync.
+Do this by running the following command from a root terminal:
+
+	usermod -a -G btsync your_user
+
+If you are using systemd you should start the service per user:
+
+	systemctl start btsync@your_user
+
+You may also tell your system to automatically launch btsync:
+
+	systemctl enable btsync@your_user
+
+You may access the web-GUI at localhost:8888.
+ 
+"
+}

net-p2p/btsync/files/btsync.conf

@@ -27,9 +27,7 @@
 */
   "webui" :
   {
-    "listen" : "0.0.0.0:8888",
+    "listen" : "0.0.0.0:8888"
-    "login" : "",
-    "password" : ""
   }
 
 /* !!! if you set shared folders in config file WebUI will be DISABLED !!!

net-p2p/btsync/files/btsync.service

@@ -3,8 +3,8 @@ Description=Bittorent Sync service
 After=network.target
  
 [Service]
-User=%I
+User=%i
-ExecStart=/opt/btsync/btsync --config /etc/btsync/config --nodaemon
+ExecStart=/opt/btsync/btsync --config /etc/btsync/btsync.conf --nodaemon
 Restart=on-abort
 
 [Install]