updated

2 files changed, 30 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 547c6e2e1b0d..2809ce4b915e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Apr 29 13:22:27 UTC 2017
+# Sat Jun 24 13:11:39 UTC 2017
 pkgbase = i2pd-git
 	pkgdesc = Simplified C++ implementation of I2P client
-	pkgver = 2.13.0.r43.g55c14819
+	pkgver = 2.14.0.r35.g14ca3fc2
 	pkgrel = 1
 	url = https://github.com/PurpleI2P/i2pd
 	install = i2pd.install
@@ -16,7 +16,7 @@ pkgbase = i2pd-git
 	depends = openssl
 	depends = zlib
 	depends = websocketpp
-	conflicts = i2pd
+	conflicts = ${_pkgname}
 	backup = etc/i2pd/i2pd.conf
 	backup = etc/i2pd/tunnels.conf
 	source = i2pd::git+https://github.com/PurpleI2P/i2pd.git#branch=master
diff --git a/PKGBUILD b/PKGBUILD
index 4f05a880b4a8..786f0ff0e041 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
-#Maintainer: Unknown
-#Contributor: kurych
-#Contributor: redfish
+# Maintainer: M0Rf30
+# Contributor: kurych
+# Contributor: redfish
 
 pkgname=i2pd-git
 _pkgname=i2pd
-pkgver=2.13.0.r43.g55c14819
+pkgver=2.14.0.r35.g14ca3fc2
 pkgrel=1
 pkgdesc="Simplified C++ implementation of I2P client"
 arch=('i686' 'x86_64' 'armv7h')
@@ -12,42 +12,45 @@ url="https://github.com/PurpleI2P/i2pd"
 license=('BSD')
 depends=('boost-libs' 'miniupnpc' 'openssl' 'zlib' 'websocketpp')
 makedepends=('boost')
-source=('i2pd::git+https://github.com/PurpleI2P/i2pd.git#branch=master'
-        i2pd.service
-        i2pd.tmpfiles.conf)
-install=i2pd.install
-backup=(etc/i2pd/i2pd.conf
-        etc/i2pd/tunnels.conf)
-conflicts=('i2pd')
+source=("${_pkgname}::git+https://github.com/PurpleI2P/i2pd.git#branch=master"
+        "${_pkgname}.service"
+        "${_pkgname}.tmpfiles.conf"
+)
+install="${_pkgname}.install"
+
+backup=("etc/${_pkgname}/${_pkgname}.conf"
+        "etc/${_pkgname}/tunnels.conf"
+)
+conflicts=('${_pkgname}')
 
 build() {
   cd $srcdir/${_pkgname}
   cd build
   cmake . -DCMAKE_CXX_FLAGS="-w" \
 	  -DCMAKE_INSTALL_PREFIX=/usr \
-	  -DWITH_UPNP=1 -DWITH_PCH=1 \
+	  -DWITH_UPNP=1 -DWITH_PCH=0 \
 	  -DCMAKE_BUILD_TYPE=Release
   make
 }
 
 package(){
-        _conf_dest=etc/${_pkgname}
-        _home_dest=var/lib/${_pkgname}
-        _share_dest=usr/share
+        _conf_dest="etc/${_pkgname}"
+        _home_dest="var/lib/${_pkgname}"
+        _share_dest="usr/share"
 
 	cd $srcdir/${_pkgname}
 
 	cd build
 	make DESTDIR=$pkgdir install
-  install -Dm0644 $srcdir/i2pd.service $pkgdir/usr/lib/systemd/system/i2pd.service
-  install -Dm0644 $srcdir/i2pd.tmpfiles.conf $pkgdir/usr/lib/tmpfiles.d/i2pd.conf
+  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
 
-  install -Dm0644 $srcdir/${_pkgname}-$pkgver/contrib/i2pd.conf $pkgdir/${_conf_dest}/i2pd.conf
-  install -Dm0644 $srcdir/${_pkgname}-$pkgver/contrib/tunnels.conf $pkgdir/${_conf_dest}/tunnels.conf
-  install -Dm0644 $srcdir/${_pkgname}-$pkgver/contrib/subscriptions.txt $pkgdir/${_conf_dest}/subscriptions.txt
+  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 -d -m0750 $pkgdir/${_home_dest}
-  ln -s /${_conf_dest}/i2pd.conf $pkgdir/${_home_dest}/i2pd.conf
+  ln -s /${_conf_dest}/${_pkgname}.conf $pkgdir/${_home_dest}/${_pkgname}.conf
   ln -s /${_conf_dest}/tunnels.conf $pkgdir/${_home_dest}/tunnels.conf
   ln -s /${_conf_dest}/subscriptions.txt $pkgdir/${_home_dest}/subscriptions.txt
 
@@ -58,7 +61,7 @@ package(){
   ln -s /${_share_dest}/${_pkgname}/certificates $pkgdir/${_home_dest}/certificates
 
   # license
-  install -Dm644 $srcdir/${_pkgname}/LICENSE "$pkgdir/${_share_dest}/licenses/${_pkgname}/LICENSE"
+  install -Dm644 $srcdir/${_pkgname}/LICENSE $pkgdir/${_share_dest}/licenses/${_pkgname}/LICENSE
 
   # docs
   _dest="$pkgdir/${_share_dest}/doc/${_pkgname}"
@@ -68,12 +71,12 @@ package(){
   rm -r $pkgdir/usr/{src,LICENSE}
 
   #man
-  install -Dm644 $srcdir/${_pkgname}/debian/i2pd.1 "$pkgdir/${_share_dest}/man/man1/i2pd.1"
+  install -Dm644 $srcdir/${_pkgname}/debian/${_pkgname}.1 $pkgdir/${_share_dest}/man/man1/${_pkgname}.1
 
   chmod -R o= $pkgdir/${_home_dest}
 }
 pkgver() {
-  cd i2pd
+  cd ${_pkgname}
   echo $(git describe --tags --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
 }