i2pd-git: updated

4 files changed, 37 insertions, 64 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2809ce4b915e..953eb5469490 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Jun 24 13:11:39 UTC 2017
+# Wed Nov 29 16:01:00 UTC 2017
 pkgbase = i2pd-git
 	pkgdesc = Simplified C++ implementation of I2P client
-	pkgver = 2.14.0.r35.g14ca3fc2
+	pkgver = 2.15.0.r142.g10085107
 	pkgrel = 1
 	url = https://github.com/PurpleI2P/i2pd
 	install = i2pd.install
@@ -11,20 +11,16 @@ pkgbase = i2pd-git
 	arch = armv7h
 	license = BSD
 	makedepends = boost
+	makedepends = cmake
 	depends = boost-libs
 	depends = miniupnpc
 	depends = openssl
 	depends = zlib
-	depends = websocketpp
-	conflicts = ${_pkgname}
+	conflicts = ${pkgname%%-git}
 	backup = etc/i2pd/i2pd.conf
 	backup = etc/i2pd/tunnels.conf
-	source = i2pd::git+https://github.com/PurpleI2P/i2pd.git#branch=master
-	source = i2pd.service
-	source = i2pd.tmpfiles.conf
+	source = i2pd::git+https://github.com/PurpleI2P/i2pd#branch=master
 	md5sums = SKIP
-	md5sums = 6e9869d619464902e635e520d21a8a56
-	md5sums = 384658d2792ef6433d2de70ebc9d40d4
 
 pkgname = i2pd-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 28a39edf9d71..38e900f5b3dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,83 +3,78 @@
 # Contributor: redfish
 
 pkgname=i2pd-git
-_pkgname=i2pd
-pkgver=2.14.0.r35.g14ca3fc2
+pkgver=2.15.0.r142.g10085107
 pkgrel=1
 pkgdesc="Simplified C++ implementation of I2P client"
 arch=('i686' 'x86_64' 'armv7h')
 url="https://github.com/PurpleI2P/i2pd"
 license=('BSD')
-depends=('boost-libs' 'miniupnpc' 'openssl' 'zlib' 'websocketpp')
-makedepends=('boost')
-source=("${_pkgname}::git+https://github.com/PurpleI2P/i2pd.git#branch=master"
-        "${_pkgname}.service"
-        "${_pkgname}.tmpfiles.conf"
-)
-install="${_pkgname}.install"
+depends=('boost-libs' 'miniupnpc' 'openssl' 'zlib')
+makedepends=('boost' 'cmake')
+source=("${pkgname%%-git}::git+https://github.com/PurpleI2P/i2pd#branch=master")
+install="${pkgname%%-git}.install"
 
-backup=("etc/${_pkgname}/${_pkgname}.conf"
-        "etc/${_pkgname}/tunnels.conf"
+backup=("etc/${pkgname%%-git}/${pkgname%%-git}.conf"
+        "etc/${pkgname%%-git}/tunnels.conf"
 )
-conflicts=('${_pkgname}')
+conflicts=('${pkgname%%-git}')
 
 build() {
-  cd $srcdir/${_pkgname}
+  cd $srcdir/${pkgname%%-git}
   cd build
   cmake . -DCMAKE_CXX_FLAGS="-w" \
 	  -DCMAKE_INSTALL_PREFIX=/usr \
-	  -DWITH_UPNP=1 -DWITH_PCH=0 \
+	  -DWITH_UPNP=ON -DWITH_PCH=OFF \
 	  -DCMAKE_BUILD_TYPE=Release
   make
 }
 
 package(){
-        _conf_dest="etc/${_pkgname}"
-        _home_dest="var/lib/${_pkgname}"
-        _share_dest="usr/share"
+  _conf_dest="etc/${pkgname%%-git}"
+  _home_dest="var/lib/${pkgname%%-git}"
+  _share_dest="usr/share"
 
-	cd $srcdir/${_pkgname}
+  cd $srcdir/${pkgname%%-git}
 
-	cd build
-	make DESTDIR=$pkgdir install
-  install -Dm0644 $srcdir/${_pkgname}.service $pkgdir/usr/lib/systemd/system/${_pkgname}.service
-  install -Dm0644 $srcdir/${_pkgname}.tmpfiles.conf $pkgdir/usr/lib/tmpfiles.d/${_pkgname}.conf
+  cd build
+  make DESTDIR=$pkgdir install
+  install -Dm0644 ../contrib/debian/${pkgname%%-git}.service $pkgdir/usr/lib/systemd/system/${pkgname%%-git}.service
+  install -Dm0644 ../contrib/debian/${pkgname%%-git}.tmpfile $pkgdir/usr/lib/tmpfiles.d/${pkgname%%-git}.conf
 
-  install -Dm0644 $srcdir/${_pkgname}/contrib/i2pd.conf $pkgdir/${_conf_dest}/${_pkgname}.conf
-  install -Dm0644 $srcdir/${_pkgname}/contrib/tunnels.conf $pkgdir/${_conf_dest}/tunnels.conf
-  install -Dm0644 $srcdir/${_pkgname}/contrib/subscriptions.txt $pkgdir/${_conf_dest}/subscriptions.txt
+  install -Dm0644 $srcdir/${pkgname%%-git}/contrib/i2pd.conf $pkgdir/${_conf_dest}/${pkgname%%-git}.conf
+  install -Dm0644 $srcdir/${pkgname%%-git}/contrib/tunnels.conf $pkgdir/${_conf_dest}/tunnels.conf
+  install -Dm0644 $srcdir/${pkgname%%-git}/contrib/subscriptions.txt $pkgdir/${_conf_dest}/subscriptions.txt
 
   install -d -m0750 $pkgdir/${_home_dest}
-  ln -s /${_conf_dest}/${_pkgname}.conf $pkgdir/${_home_dest}/${_pkgname}.conf
+  ln -s /${_conf_dest}/${pkgname%%-git}.conf $pkgdir/${_home_dest}/${pkgname%%-git}.conf
   ln -s /${_conf_dest}/tunnels.conf $pkgdir/${_home_dest}/tunnels.conf
   ln -s /${_conf_dest}/subscriptions.txt $pkgdir/${_home_dest}/subscriptions.txt
 
-  cd $srcdir/${_pkgname}/contrib
-  _dest="$pkgdir/${_share_dest}/${_pkgname}"
+  cd $srcdir/${pkgname%%-git}/contrib
+  _dest="$pkgdir/${_share_dest}/${pkgname%%-git}"
   find ./certificates -type d -exec install -d {} ${_dest}/{} \;
   find ./certificates -type f -exec install -Dm644 {} ${_dest}/{} \;
-  ln -s /${_share_dest}/${_pkgname}/certificates $pkgdir/${_home_dest}/certificates
+  ln -s /${_share_dest}/${pkgname%%-git}/certificates $pkgdir/${_home_dest}/certificates
 
   # license
-  install -Dm644 $srcdir/${_pkgname}/LICENSE $pkgdir/${_share_dest}/licenses/${_pkgname}/LICENSE
+  install -Dm644 $srcdir/${pkgname%%-git}/LICENSE $pkgdir/${_share_dest}/licenses/${pkgname%%-git}/LICENSE
 
   # docs
-  _dest="$pkgdir/${_share_dest}/doc/${_pkgname}"
-  install -Dm644 $srcdir/${_pkgname}/README.md "${_dest}/README.md"
+  _dest="$pkgdir/${_share_dest}/doc/${pkgname%%-git}"
+  install -Dm644 $srcdir/${pkgname%%-git}/README.md "${_dest}/README.md"
 
   # remove src folder and LICENSE
   rm -r $pkgdir/usr/{src,LICENSE}
 
   #man
-  install -Dm644 $srcdir/${_pkgname}/debian/${_pkgname}.1 $pkgdir/${_share_dest}/man/man1/${_pkgname}.1
+  install -Dm644 $srcdir/${pkgname%%-git}/debian/${pkgname%%-git}.1 $pkgdir/${_share_dest}/man/man1/${pkgname%%-git}.1
 
   chmod -R o= $pkgdir/${_home_dest}
 }
+
 pkgver() {
-  cd ${_pkgname}
+  cd ${pkgname%%-git}
   echo $(git describe --tags --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
 }
 
-md5sums=('SKIP'
-         '6e9869d619464902e635e520d21a8a56'
-         '384658d2792ef6433d2de70ebc9d40d4')
+md5sums=('SKIP')
diff --git a/i2pd.service b/i2pd.service
deleted file mode 100644
index 604aa1ca4666..000000000000
--- a/i2pd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=C++ daemon for accessing the I2P network
-After=network.target
-
-[Service]
-Type=forking
-Restart=on-abnormal
-PIDFile=/run/i2pd/i2pd.pid
-User=i2pd
-Group=i2pd
-LimitNOFILE=4096
-PermissionsStartOnly=yes
-ExecStart=/usr/bin/i2pd --daemon --service --pidfile=/run/i2pd/i2pd.pid --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/i2pd.tmpfiles.conf b/i2pd.tmpfiles.conf
deleted file mode 100644
index 43f3f5bd02a4..000000000000
--- a/i2pd.tmpfiles.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-d /run/i2pd 0755 i2pd i2pd -
-d /var/log/i2pd 0755 i2pd i2pd -