zeronet -> zeronet-conservancy

2 files changed, 26 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 08e242dd6181..16998916b119 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
-pkgbase = zeronet-git
-	pkgdesc = Decentralized websites using Bitcoin crypto and the BitTorrent network.
-	pkgver = 0.7.2
+pkgbase = zeronet-conservancy-git
+	pkgdesc = modern client for decentralized p2p web platform 0net
+	pkgver = 0.7.7+.r5035.g3c93ca6a
 	pkgrel = 1
-	url = https://zeronet.io/
+	url = https://github.com/zeronet-conservancy/zeronet-conservancy/
 	install = zeronet.install
 	arch = any
 	license = GPL2
@@ -18,26 +18,24 @@ pkgbase = zeronet-git
 	depends = python-pysocks
 	depends = python-pyasn1
 	depends = python-pyasn1-modules
-	depends = python-base58
-	depends = python-merkletools
-	depends = python-pyelliptic>=2.0.1
-	depends = python-bencode.py
-	depends = python-coincurve
 	depends = python-bitcoinlib
-	depends = python-maxminddb
+	depends = python-pyaes
 	depends = geoip2-database
+	depends = python-defusedxml
+	depends = python-rich
+	depends = python-base58
+	depends = python-merkletools
 	optdepends = tor: anonymity
 	optdepends = namecoin-core: local name resolution
 	provides = zeronet
 	conflicts = zeronet
 	options = !strip
 	backup = etc/zeronet.conf
-	source = git+https://github.com/HelloZeroNet/ZeroNet.git#branch=py3
+	source = git+https://github.com/zeronet-conservancy/zeronet-conservancy.git#branch=master
 	source = zeronet.conf
 	source = zeronet.service
 	sha256sums = SKIP
 	sha256sums = ea735e82dbb10a2c1fda7abfeb2f38c2429044d8254f9e2396c50cecb6f778f8
 	sha256sums = 2ee64a1b671a49a1626901a11d4d7fa338c77cb9b7c9facd2f56b087a4a0bb83
 
-pkgname = zeronet-git
-
+pkgname = zeronet-conservancy-git
diff --git a/PKGBUILD b/PKGBUILD
index 549ce4c21cd6..ddc8b306f34c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,33 @@
-# Maintainer: redfish <redfish at galactica dot pw>
+# Maintainer: caryoscelus <caryoscelus at gmx dot com>
+# Contributor: redfish <redfish at galactica dot pw>
 # Contributor: Lothar_m <lothar_m at riseup dot net>
 
-pkgname='zeronet-git'
-_gitname='ZeroNet'
-_gitroot='https://github.com/HelloZeroNet/ZeroNet.git'
-pkgver=0.7.2
+pkgname='zeronet-conservancy-git'
+_gitname='zeronet-conservancy'
+_gitroot='https://github.com/zeronet-conservancy/zeronet-conservancy.git'
+pkgver=0.7.7+.r5035.g3c93ca6a
 pkgrel=1
 arch=('any')
-url="https://zeronet.io/"
+url='https://github.com/zeronet-conservancy/zeronet-conservancy/'
 depends=('python' 'python-gevent>=1.1.0' 'python-gevent-websocket'
 	'python-msgpack>=0.4.4' 'python-websocket-client' 'python-rsa'
 	'python-pysocks' 'python-pyasn1' 'python-pyasn1-modules'
+	'python-bitcoinlib'
+	'python-pyaes'
+	'geoip2-database'
+	'python-defusedxml'
+	'python-rich'
 	'python-base58' 'python-merkletools'
-	'python-pyelliptic>=2.0.1'
-	'python-bencode.py' 'python-coincurve'
-	'python-bitcoinlib' 'python-maxminddb'
-	'geoip2-database')
+)
 optdepends=('tor: anonymity'
 	    'namecoin-core: local name resolution')
 makedepends=('git')
 checkdepends=('python-pytest' 'python-mock')
 license=('GPL2')
-pkgdesc="Decentralized websites using Bitcoin crypto and the BitTorrent network."
+pkgdesc="modern client for decentralized p2p web platform 0net"
 provides=(zeronet)
 conflicts=(zeronet)
-source=("git+https://github.com/HelloZeroNet/ZeroNet.git#branch=py3"
+source=("git+https://github.com/zeronet-conservancy/zeronet-conservancy.git#branch=master"
         "zeronet.conf"
         "zeronet.service")
 install="zeronet.install"