[PR PATCH] New package: yacy-1.922

[PR PATCH] New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

There is a new pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages master
https://github.com/void-linux/void-packages/pull/23695

New package: yacy-1.922


A patch file from https://github.com/void-linux/void-packages/pull/23695.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-23695.patch --]
[-- Type: text/x-diff, Size: 1549 bytes --]

From 4fd71c809b1c31e2dabe93e116948b7526106936 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 16:38:46 -0500
Subject: [PATCH] New package: yacy-1.922

---
 srcpkgs/yacy/files/yacy/run |  2 ++
 srcpkgs/yacy/template       | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 srcpkgs/yacy/files/yacy/run
 create mode 100644 srcpkgs/yacy/template

diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..594bcc2a3c8
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..02b9259024b
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,30 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+archs="x86_64"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/opt/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/opt/yacy 0755 yacy yacy"
+
+post_extract() {
+mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+}
+
+do_install() {
+vmkdir opt/yacy
+vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+}
+
+post_install() {
+vsv yacy
+}

Re: [PR REVIEW] New package: yacy-1.922

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 218 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#discussion_r458411377

Comment:
I believe it's preferred to have the homedir in `/var` (could be wrong)

Re: [PR REVIEW] New package: yacy-1.922

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#discussion_r458411128

Comment:
why is it restriced to x86_64?

Re: [PR REVIEW] New package: yacy-1.922

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 163 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#discussion_r458410302

Comment:
indent with tabs

Re: New package: yacy-1.922

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 203 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#issuecomment-662127289

Comment:
https://github.com/yacy/yacy_search_server#compile-from-source

Re: [PR PATCH] [Updated] New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages master
https://github.com/void-linux/void-packages/pull/23695

New package: yacy-1.922


A patch file from https://github.com/void-linux/void-packages/pull/23695.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-23695.patch --]
[-- Type: text/x-diff, Size: 2897 bytes --]

From 4fd71c809b1c31e2dabe93e116948b7526106936 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 16:38:46 -0500
Subject: [PATCH 1/2] New package: yacy-1.922

---
 srcpkgs/yacy/files/yacy/run |  2 ++
 srcpkgs/yacy/template       | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 srcpkgs/yacy/files/yacy/run
 create mode 100644 srcpkgs/yacy/template

diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..594bcc2a3c8
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..02b9259024b
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,30 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+archs="x86_64"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/opt/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/opt/yacy 0755 yacy yacy"
+
+post_extract() {
+mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+}
+
+do_install() {
+vmkdir opt/yacy
+vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+}
+
+post_install() {
+vsv yacy
+}

From 4f6c60fd783f918a095444a32c6d637bf612fcc4 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 17:36:20 -0500
Subject: [PATCH 2/2] google-earth-pro: update to 7.3.3.7721

---
 srcpkgs/google-earth-pro/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..68927d21731 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
 license="Google"
 repository=nonfree
 restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
 
 nostrip=yes
 

Re: [PR PATCH] [Updated] New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages master
https://github.com/void-linux/void-packages/pull/23695

New package: yacy-1.922


A patch file from https://github.com/void-linux/void-packages/pull/23695.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-23695.patch --]
[-- Type: text/x-diff, Size: 3514 bytes --]

From 4fd71c809b1c31e2dabe93e116948b7526106936 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 16:38:46 -0500
Subject: [PATCH 1/3] New package: yacy-1.922

---
 srcpkgs/yacy/files/yacy/run |  2 ++
 srcpkgs/yacy/template       | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 srcpkgs/yacy/files/yacy/run
 create mode 100644 srcpkgs/yacy/template

diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..594bcc2a3c8
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..02b9259024b
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,30 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+archs="x86_64"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/opt/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/opt/yacy 0755 yacy yacy"
+
+post_extract() {
+mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+}
+
+do_install() {
+vmkdir opt/yacy
+vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+}
+
+post_install() {
+vsv yacy
+}

From 4f6c60fd783f918a095444a32c6d637bf612fcc4 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 17:36:20 -0500
Subject: [PATCH 2/3] google-earth-pro: update to 7.3.3.7721

---
 srcpkgs/google-earth-pro/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..68927d21731 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
 license="Google"
 repository=nonfree
 restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
 
 nostrip=yes
 

From f7ef58a73d1635afcc9734a27439b677ea165b43 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:08:51 -0500
Subject: [PATCH 3/3] yacy: remove arch restriction

---
 srcpkgs/yacy/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 02b9259024b..5f8534c21ef 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -2,7 +2,6 @@
 pkgname=yacy
 version=1.922
 revision=1
-archs="x86_64"
 depends="openjdk-jre"
 short_desc="YaCy p2p decentralized search engine"
 maintainer="Jason Manley <jason@jasondavid.tv>"

Re: [PR PATCH] [Updated] New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages master
https://github.com/void-linux/void-packages/pull/23695

New package: yacy-1.922


A patch file from https://github.com/void-linux/void-packages/pull/23695.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-23695.patch --]
[-- Type: text/x-diff, Size: 4929 bytes --]

From 4fd71c809b1c31e2dabe93e116948b7526106936 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 16:38:46 -0500
Subject: [PATCH 1/4] New package: yacy-1.922

---
 srcpkgs/yacy/files/yacy/run |  2 ++
 srcpkgs/yacy/template       | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 srcpkgs/yacy/files/yacy/run
 create mode 100644 srcpkgs/yacy/template

diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..594bcc2a3c8
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..02b9259024b
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,30 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+archs="x86_64"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/opt/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/opt/yacy 0755 yacy yacy"
+
+post_extract() {
+mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+}
+
+do_install() {
+vmkdir opt/yacy
+vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+}
+
+post_install() {
+vsv yacy
+}

From 4f6c60fd783f918a095444a32c6d637bf612fcc4 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 17:36:20 -0500
Subject: [PATCH 2/4] google-earth-pro: update to 7.3.3.7721

---
 srcpkgs/google-earth-pro/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..68927d21731 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
 license="Google"
 repository=nonfree
 restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
 
 nostrip=yes
 

From f7ef58a73d1635afcc9734a27439b677ea165b43 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:08:51 -0500
Subject: [PATCH 3/4] yacy: remove arch restriction

---
 srcpkgs/yacy/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 02b9259024b..5f8534c21ef 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -2,7 +2,6 @@
 pkgname=yacy
 version=1.922
 revision=1
-archs="x86_64"
 depends="openjdk-jre"
 short_desc="YaCy p2p decentralized search engine"
 maintainer="Jason Manley <jason@jasondavid.tv>"

From fe345d6bef848046987c4c8c131dd9d61944cfb9 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:14:56 -0500
Subject: [PATCH 4/4] Revert "google-earth-pro: update to 7.3.3.7721"

This reverts commit 4f6c60fd783f918a095444a32c6d637bf612fcc4.
---
 srcpkgs/google-earth-pro/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 68927d21731..41763ae7d25 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.3.7721
+version=7.3.2.5494
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Jason Manley <jason@jasondavid.tv>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Google"
 repository=nonfree
 restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
 
 nostrip=yes
 

Re: [PR REVIEW] New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 416 bytes --]

New review comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#discussion_r458442779

Comment:
It works perfectly well in this case of not building from source. I removed the arch restriction too. I did do some testing with "ant clean all" in do_install but can't figure out what java package is needed in makedepends. It keeps erroring out trying to find java.

Re: [PR PATCH] [Updated] New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages master
https://github.com/void-linux/void-packages/pull/23695

New package: yacy-1.922


A patch file from https://github.com/void-linux/void-packages/pull/23695.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-23695.patch --]
[-- Type: text/x-diff, Size: 5753 bytes --]

From 4fd71c809b1c31e2dabe93e116948b7526106936 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 16:38:46 -0500
Subject: [PATCH 1/5] New package: yacy-1.922

---
 srcpkgs/yacy/files/yacy/run |  2 ++
 srcpkgs/yacy/template       | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 srcpkgs/yacy/files/yacy/run
 create mode 100644 srcpkgs/yacy/template

diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..594bcc2a3c8
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..02b9259024b
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,30 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+archs="x86_64"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/opt/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/opt/yacy 0755 yacy yacy"
+
+post_extract() {
+mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+}
+
+do_install() {
+vmkdir opt/yacy
+vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+}
+
+post_install() {
+vsv yacy
+}

From 4f6c60fd783f918a095444a32c6d637bf612fcc4 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 17:36:20 -0500
Subject: [PATCH 2/5] google-earth-pro: update to 7.3.3.7721

---
 srcpkgs/google-earth-pro/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..68927d21731 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
 license="Google"
 repository=nonfree
 restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
 
 nostrip=yes
 

From f7ef58a73d1635afcc9734a27439b677ea165b43 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:08:51 -0500
Subject: [PATCH 3/5] yacy: remove arch restriction

---
 srcpkgs/yacy/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 02b9259024b..5f8534c21ef 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -2,7 +2,6 @@
 pkgname=yacy
 version=1.922
 revision=1
-archs="x86_64"
 depends="openjdk-jre"
 short_desc="YaCy p2p decentralized search engine"
 maintainer="Jason Manley <jason@jasondavid.tv>"

From fe345d6bef848046987c4c8c131dd9d61944cfb9 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:14:56 -0500
Subject: [PATCH 4/5] Revert "google-earth-pro: update to 7.3.3.7721"

This reverts commit 4f6c60fd783f918a095444a32c6d637bf612fcc4.
---
 srcpkgs/google-earth-pro/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 68927d21731..41763ae7d25 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.3.7721
+version=7.3.2.5494
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Jason Manley <jason@jasondavid.tv>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Google"
 repository=nonfree
 restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
 
 nostrip=yes
 

From 5180ee51bb32f9468c6dba0d9939ad9b1145450f Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:17:31 -0500
Subject: [PATCH 5/5] Add indentation to do_install step.

---
 srcpkgs/yacy/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 5f8534c21ef..86b2adc23c8 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -16,14 +16,14 @@ yacy_shell="/bin/bash"
 make_dirs="/opt/yacy 0755 yacy yacy"
 
 post_extract() {
-mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+	mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
 }
 
 do_install() {
-vmkdir opt/yacy
-vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+	vmkdir opt/yacy
+	vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
 }
 
 post_install() {
-vsv yacy
+	vsv yacy
 }

Re: [PR REVIEW] New package: yacy-1.922

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 294 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#discussion_r458444438

Comment:
You need the actual development kit to build something with java, so add `openjdk` to `hostmakedepends`. You might need to set `JAVA_HOME` as well.

Re: New package: yacy-1.922

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 186 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#issuecomment-662155987

Comment:
Squash your commits when you're done, please.

Re: [PR REVIEW] New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 292 bytes --]

New review comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#discussion_r458445230

Comment:
I did try with openjdk as a makedepends (in addition of course to apache-ant), but I'm not too familiar with how JAVA_HOME should be set here.

Re: [PR REVIEW] New package: yacy-1.922

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 197 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#discussion_r458446218

Comment:
Take a look at how lightzone does it, for example.

Re: [PR REVIEW] New package: yacy-1.922

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 317 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#discussion_r458446802

Comment:
Are there other options users could pass to the start script? You can include a check for a conf file and source it if available. Several other services have this option.

Re: [PR REVIEW] New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 1658 bytes --]

New review comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#discussion_r458447664

Comment:
Maybe the -s switch here below has some potential. could set to ~/.yacy or something.

`/opt/yacy/startYACY.sh --help
startscript for YaCy on UNIX-like systems
Options
  -h, --help		show this help
  -t, --tail-log	show the output of "tail -f DATA/LOG/yacy00.log" after starting YaCy
  -l, --logging		save the output of YaCy to yacy.log
  -d, --debug		show the output of YaCy on the console and enable remote monitoring with JMX
  -f, --foreground	run as a foreground process, showing the output of YaCy on the console
  -p, --print-out	only print the command, which would be executed to start YaCy
  -s, --startup [data-path] start YaCy using the specified data folder path, relative to the current user home
  -g, --gui		start a gui for YaCy
[jason@box ~]$ ls /opt/yacy
addon    build.properties  DATA                 gpl.txt                        killYACY.sh  libbuild  reconfigureYACY.sh  startYACY.bat        stopYACY.bat                     updateYACY.sh
AUTHORS  build.xml         defaults             htroot                         langdetect   locales   skins               startYACY_debug.bat  stopYACY.sh                      yacy.yellow
bin      COPYRIGHT         getWin32MaxHeap.bat  installYaCyWindowsService.bat  lib          NOTICE    source              startYACY.sh         uninstallYaCyWindowsService.bat
[jason@box ~]$ ls /opt/yacy/DATA/
ARCHIVE  CLASSIFICATION  DICTIONARIES  HTCACHE  HTDOCS  INDEX  LISTS  LOG  RELEASE  SETTINGS  SKINS  SURROGATES  WORK  yacy.running`

Re: [PR REVIEW] New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 1658 bytes --]

New review comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#discussion_r458447664

Comment:
Maybe the -s switch here below has some potential. could set to ~/.yacy or something.

`/opt/yacy/startYACY.sh --help
startscript for YaCy on UNIX-like systems
Options
  -h, --help		show this help
  -t, --tail-log	show the output of "tail -f DATA/LOG/yacy00.log" after starting YaCy
  -l, --logging		save the output of YaCy to yacy.log
  -d, --debug		show the output of YaCy on the console and enable remote monitoring with JMX
  -f, --foreground	run as a foreground process, showing the output of YaCy on the console
  -p, --print-out	only print the command, which would be executed to start YaCy
  -s, --startup [data-path] start YaCy using the specified data folder path, relative to the current user home
  -g, --gui		start a gui for YaCy
[jason@box ~]$ ls /opt/yacy
addon    build.properties  DATA                 gpl.txt                        killYACY.sh  libbuild  reconfigureYACY.sh  startYACY.bat        stopYACY.bat                     updateYACY.sh
AUTHORS  build.xml         defaults             htroot                         langdetect   locales   skins               startYACY_debug.bat  stopYACY.sh                      yacy.yellow
bin      COPYRIGHT         getWin32MaxHeap.bat  installYaCyWindowsService.bat  lib          NOTICE    source              startYACY.sh         uninstallYaCyWindowsService.bat
[jason@box ~]$ ls /opt/yacy/DATA/
ARCHIVE  CLASSIFICATION  DICTIONARIES  HTCACHE  HTDOCS  INDEX  LISTS  LOG  RELEASE  SETTINGS  SKINS  SURROGATES  WORK  yacy.running`

Re: [PR REVIEW] New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 1573 bytes --]

New review comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#discussion_r458447818

Comment:
`/opt/yacy/startYACY.sh --help
startscript for YaCy on UNIX-like systems
Options
  -h, --help		show this help
  -t, --tail-log	show the output of "tail -f DATA/LOG/yacy00.log" after starting YaCy
  -l, --logging		save the output of YaCy to yacy.log
  -d, --debug		show the output of YaCy on the console and enable remote monitoring with JMX
  -f, --foreground	run as a foreground process, showing the output of YaCy on the console
  -p, --print-out	only print the command, which would be executed to start YaCy
  -s, --startup [data-path] start YaCy using the specified data folder path, relative to the current user home
  -g, --gui		start a gui for YaCy

[jason@box ~]$ ls /opt/yacy
addon    build.properties  DATA                 gpl.txt                        killYACY.sh  libbuild  reconfigureYACY.sh  startYACY.bat        stopYACY.bat                     updateYACY.sh
AUTHORS  build.xml         defaults             htroot                         langdetect   locales   skins               startYACY_debug.bat  stopYACY.sh                      yacy.yellow
bin      COPYRIGHT         getWin32MaxHeap.bat  installYaCyWindowsService.bat  lib          NOTICE    source              startYACY.sh         uninstallYaCyWindowsService.bat

[jason@box ~]$ ls /opt/yacy/DATA/
ARCHIVE  CLASSIFICATION  DICTIONARIES  HTCACHE  HTDOCS  INDEX  LISTS  LOG  RELEASE  SETTINGS  SKINS  SURROGATES  WORK  yacy.running`

Re: [PR REVIEW] New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 1652 bytes --]

New review comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#discussion_r458447818

Comment:
Maybe -s has potential, I could set to ~/.yacy or something.

`[jason@box ~]$ /opt/yacy/startYACY.sh --help
startscript for YaCy on UNIX-like systems
Options
  -h, --help		show this help
  -t, --tail-log	show the output of "tail -f DATA/LOG/yacy00.log" after starting YaCy
  -l, --logging		save the output of YaCy to yacy.log
  -d, --debug		show the output of YaCy on the console and enable remote monitoring with JMX
  -f, --foreground	run as a foreground process, showing the output of YaCy on the console
  -p, --print-out	only print the command, which would be executed to start YaCy
  -s, --startup [data-path] start YaCy using the specified data folder path, relative to the current user home
  -g, --gui		start a gui for YaCy

[jason@box ~]$ ls /opt/yacy
addon    build.properties  DATA                 gpl.txt                        killYACY.sh  libbuild  reconfigureYACY.sh  startYACY.bat        stopYACY.bat                     updateYACY.sh
AUTHORS  build.xml         defaults             htroot                         langdetect   locales   skins               startYACY_debug.bat  stopYACY.sh                      yacy.yellow
bin      COPYRIGHT         getWin32MaxHeap.bat  installYaCyWindowsService.bat  lib          NOTICE    source              startYACY.sh         uninstallYaCyWindowsService.bat

[jason@box ~]$ ls /opt/yacy/DATA/
ARCHIVE  CLASSIFICATION  DICTIONARIES  HTCACHE  HTDOCS  INDEX  LISTS  LOG  RELEASE  SETTINGS  SKINS  SURROGATES  WORK  yacy.running`

Re: [PR REVIEW] New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 1616 bytes --]

New review comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#discussion_r458447818

Comment:
Maybe -s has potential ?

`[jason@box ~]$ /opt/yacy/startYACY.sh --help
startscript for YaCy on UNIX-like systems
Options
  -h, --help		show this help
  -t, --tail-log	show the output of "tail -f DATA/LOG/yacy00.log" after starting YaCy
  -l, --logging		save the output of YaCy to yacy.log
  -d, --debug		show the output of YaCy on the console and enable remote monitoring with JMX
  -f, --foreground	run as a foreground process, showing the output of YaCy on the console
  -p, --print-out	only print the command, which would be executed to start YaCy
  -s, --startup [data-path] start YaCy using the specified data folder path, relative to the current user home
  -g, --gui		start a gui for YaCy

[jason@box ~]$ ls /opt/yacy
addon    build.properties  DATA                 gpl.txt                        killYACY.sh  libbuild  reconfigureYACY.sh  startYACY.bat        stopYACY.bat                     updateYACY.sh
AUTHORS  build.xml         defaults             htroot                         langdetect   locales   skins               startYACY_debug.bat  stopYACY.sh                      yacy.yellow
bin      COPYRIGHT         getWin32MaxHeap.bat  installYaCyWindowsService.bat  lib          NOTICE    source              startYACY.sh         uninstallYaCyWindowsService.bat

[jason@box ~]$ ls /opt/yacy/DATA/
ARCHIVE  CLASSIFICATION  DICTIONARIES  HTCACHE  HTDOCS  INDEX  LISTS  LOG  RELEASE  SETTINGS  SKINS  SURROGATES  WORK  yacy.running`

Re: [PR REVIEW] New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 1721 bytes --]

New review comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#discussion_r458447818

Comment:
Maybe -s has potential ? Though probably not too useful as I have this run as its own user with home dir set as /opt/yacy anyway.

`[jason@box ~]$ /opt/yacy/startYACY.sh --help
startscript for YaCy on UNIX-like systems
Options
  -h, --help		show this help
  -t, --tail-log	show the output of "tail -f DATA/LOG/yacy00.log" after starting YaCy
  -l, --logging		save the output of YaCy to yacy.log
  -d, --debug		show the output of YaCy on the console and enable remote monitoring with JMX
  -f, --foreground	run as a foreground process, showing the output of YaCy on the console
  -p, --print-out	only print the command, which would be executed to start YaCy
  -s, --startup [data-path] start YaCy using the specified data folder path, relative to the current user home
  -g, --gui		start a gui for YaCy

[jason@box ~]$ ls /opt/yacy
addon    build.properties  DATA                 gpl.txt                        killYACY.sh  libbuild  reconfigureYACY.sh  startYACY.bat        stopYACY.bat                     updateYACY.sh
AUTHORS  build.xml         defaults             htroot                         langdetect   locales   skins               startYACY_debug.bat  stopYACY.sh                      yacy.yellow
bin      COPYRIGHT         getWin32MaxHeap.bat  installYaCyWindowsService.bat  lib          NOTICE    source              startYACY.sh         uninstallYaCyWindowsService.bat

[jason@box ~]$ ls /opt/yacy/DATA/
ARCHIVE  CLASSIFICATION  DICTIONARIES  HTCACHE  HTDOCS  INDEX  LISTS  LOG  RELEASE  SETTINGS  SKINS  SURROGATES  WORK  yacy.running`

Re: New package: yacy-1.922

[fosslinux]

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#issuecomment-662164178

Comment:
Remove the google-earth-pro stuff from this PR too, please.

Re: New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 210 bytes --]

New comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#issuecomment-662166161

Comment:
How would I remove those commits?
git rebase -i <commit id> 
???

Re: [PR REVIEW] New package: yacy-1.922

[fosslinux]

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

New review comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#discussion_r458454962

Comment:
`/var/lib` is probably the correct place. for example https://github.com/void-linux/void-packages/blob/master/srcpkgs/gitea/template#L38

`/opt` is defiantly not right

Re: New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 598 bytes --]

New comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#issuecomment-662166614

Comment:
> This should be compiled from source. I don't see any reason for this not to be compiled from source...
> 
> Resources:
> 
> https://github.com/yacy/yacy_search_server#compile-from-source
> https://github.com/yacy/yacy_search_server/archive/Release_1.92.tar.gz

I am testing building from source and will have this PR up to date with that shortly. /var/lib may be the better place for this as well (I think similar to packages like transmission).

Re: [PR PATCH] [Updated] New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages master
https://github.com/void-linux/void-packages/pull/23695

New package: yacy-1.922


A patch file from https://github.com/void-linux/void-packages/pull/23695.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-23695.patch --]
[-- Type: text/x-diff, Size: 7478 bytes --]

From 4fd71c809b1c31e2dabe93e116948b7526106936 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 16:38:46 -0500
Subject: [PATCH 1/6] New package: yacy-1.922

---
 srcpkgs/yacy/files/yacy/run |  2 ++
 srcpkgs/yacy/template       | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 srcpkgs/yacy/files/yacy/run
 create mode 100644 srcpkgs/yacy/template

diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..594bcc2a3c8
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..02b9259024b
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,30 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+archs="x86_64"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/opt/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/opt/yacy 0755 yacy yacy"
+
+post_extract() {
+mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+}
+
+do_install() {
+vmkdir opt/yacy
+vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+}
+
+post_install() {
+vsv yacy
+}

From 4f6c60fd783f918a095444a32c6d637bf612fcc4 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 17:36:20 -0500
Subject: [PATCH 2/6] google-earth-pro: update to 7.3.3.7721

---
 srcpkgs/google-earth-pro/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..68927d21731 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
 license="Google"
 repository=nonfree
 restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
 
 nostrip=yes
 

From f7ef58a73d1635afcc9734a27439b677ea165b43 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:08:51 -0500
Subject: [PATCH 3/6] yacy: remove arch restriction

---
 srcpkgs/yacy/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 02b9259024b..5f8534c21ef 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -2,7 +2,6 @@
 pkgname=yacy
 version=1.922
 revision=1
-archs="x86_64"
 depends="openjdk-jre"
 short_desc="YaCy p2p decentralized search engine"
 maintainer="Jason Manley <jason@jasondavid.tv>"

From fe345d6bef848046987c4c8c131dd9d61944cfb9 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:14:56 -0500
Subject: [PATCH 4/6] Revert "google-earth-pro: update to 7.3.3.7721"

This reverts commit 4f6c60fd783f918a095444a32c6d637bf612fcc4.
---
 srcpkgs/google-earth-pro/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 68927d21731..41763ae7d25 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.3.7721
+version=7.3.2.5494
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Jason Manley <jason@jasondavid.tv>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Google"
 repository=nonfree
 restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
 
 nostrip=yes
 

From 5180ee51bb32f9468c6dba0d9939ad9b1145450f Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:17:31 -0500
Subject: [PATCH 5/6] Add indentation to do_install step.

---
 srcpkgs/yacy/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 5f8534c21ef..86b2adc23c8 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -16,14 +16,14 @@ yacy_shell="/bin/bash"
 make_dirs="/opt/yacy 0755 yacy yacy"
 
 post_extract() {
-mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+	mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
 }
 
 do_install() {
-vmkdir opt/yacy
-vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+	vmkdir opt/yacy
+	vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
 }
 
 post_install() {
-vsv yacy
+	vsv yacy
 }

From 81598c4dba58cb2ab6f554c899dac50ccd551dfe Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 19:17:04 -0500
Subject: [PATCH 6/6] yacy: change path to /var/lib/yacy and other fixes.

---
 srcpkgs/yacy/files/yacy/run |  2 +-
 srcpkgs/yacy/template       | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
index 594bcc2a3c8..c5544513c35 100644
--- a/srcpkgs/yacy/files/yacy/run
+++ b/srcpkgs/yacy/files/yacy/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
+exec chpst -u yacy:yacy /var/lib/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 86b2adc23c8..3d3ad7e438f 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -2,6 +2,7 @@
 pkgname=yacy
 version=1.922
 revision=1
+hostmakedepends="openjdk apache-ant"
 depends="openjdk-jre"
 short_desc="YaCy p2p decentralized search engine"
 maintainer="Jason Manley <jason@jasondavid.tv>"
@@ -11,17 +12,22 @@ distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
 checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
 
 system_accounts="yacy"
-yacy_homedir="/opt/yacy"
+yacy_homedir="/var/lib/yacy"
 yacy_shell="/bin/bash"
-make_dirs="/opt/yacy 0755 yacy yacy"
+make_dirs="/var/lib/yacy 0755 yacy yacy"
 
 post_extract() {
 	mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
 }
 
+do_build() {
+	export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
+	ant clean all
+}
+
 do_install() {
-	vmkdir opt/yacy
-	vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+	vmkdir var/lib/yacy
+	vcopy $XBPS_BUILDDIR/yacy-1.922/* var/lib/yacy
 }
 
 post_install() {

Re: [PR PATCH] [Updated] New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages master
https://github.com/void-linux/void-packages/pull/23695

New package: yacy-1.922


A patch file from https://github.com/void-linux/void-packages/pull/23695.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-23695.patch --]
[-- Type: text/x-diff, Size: 7478 bytes --]

From 4fd71c809b1c31e2dabe93e116948b7526106936 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 16:38:46 -0500
Subject: [PATCH 1/6] New package: yacy-1.922

---
 srcpkgs/yacy/files/yacy/run |  2 ++
 srcpkgs/yacy/template       | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 srcpkgs/yacy/files/yacy/run
 create mode 100644 srcpkgs/yacy/template

diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..594bcc2a3c8
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..02b9259024b
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,30 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+archs="x86_64"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/opt/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/opt/yacy 0755 yacy yacy"
+
+post_extract() {
+mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+}
+
+do_install() {
+vmkdir opt/yacy
+vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+}
+
+post_install() {
+vsv yacy
+}

From 4f6c60fd783f918a095444a32c6d637bf612fcc4 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 17:36:20 -0500
Subject: [PATCH 2/6] google-earth-pro: update to 7.3.3.7721

---
 srcpkgs/google-earth-pro/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..68927d21731 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
 license="Google"
 repository=nonfree
 restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
 
 nostrip=yes
 

From f7ef58a73d1635afcc9734a27439b677ea165b43 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:08:51 -0500
Subject: [PATCH 3/6] yacy: remove arch restriction

---
 srcpkgs/yacy/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 02b9259024b..5f8534c21ef 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -2,7 +2,6 @@
 pkgname=yacy
 version=1.922
 revision=1
-archs="x86_64"
 depends="openjdk-jre"
 short_desc="YaCy p2p decentralized search engine"
 maintainer="Jason Manley <jason@jasondavid.tv>"

From fe345d6bef848046987c4c8c131dd9d61944cfb9 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:14:56 -0500
Subject: [PATCH 4/6] Revert "google-earth-pro: update to 7.3.3.7721"

This reverts commit 4f6c60fd783f918a095444a32c6d637bf612fcc4.
---
 srcpkgs/google-earth-pro/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 68927d21731..41763ae7d25 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.3.7721
+version=7.3.2.5494
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Jason Manley <jason@jasondavid.tv>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Google"
 repository=nonfree
 restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
 
 nostrip=yes
 

From 5180ee51bb32f9468c6dba0d9939ad9b1145450f Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:17:31 -0500
Subject: [PATCH 5/6] Add indentation to do_install step.

---
 srcpkgs/yacy/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 5f8534c21ef..86b2adc23c8 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -16,14 +16,14 @@ yacy_shell="/bin/bash"
 make_dirs="/opt/yacy 0755 yacy yacy"
 
 post_extract() {
-mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+	mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
 }
 
 do_install() {
-vmkdir opt/yacy
-vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+	vmkdir opt/yacy
+	vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
 }
 
 post_install() {
-vsv yacy
+	vsv yacy
 }

From 81598c4dba58cb2ab6f554c899dac50ccd551dfe Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 19:17:04 -0500
Subject: [PATCH 6/6] yacy: change path to /var/lib/yacy and other fixes.

---
 srcpkgs/yacy/files/yacy/run |  2 +-
 srcpkgs/yacy/template       | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
index 594bcc2a3c8..c5544513c35 100644
--- a/srcpkgs/yacy/files/yacy/run
+++ b/srcpkgs/yacy/files/yacy/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
+exec chpst -u yacy:yacy /var/lib/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 86b2adc23c8..3d3ad7e438f 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -2,6 +2,7 @@
 pkgname=yacy
 version=1.922
 revision=1
+hostmakedepends="openjdk apache-ant"
 depends="openjdk-jre"
 short_desc="YaCy p2p decentralized search engine"
 maintainer="Jason Manley <jason@jasondavid.tv>"
@@ -11,17 +12,22 @@ distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
 checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
 
 system_accounts="yacy"
-yacy_homedir="/opt/yacy"
+yacy_homedir="/var/lib/yacy"
 yacy_shell="/bin/bash"
-make_dirs="/opt/yacy 0755 yacy yacy"
+make_dirs="/var/lib/yacy 0755 yacy yacy"
 
 post_extract() {
 	mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
 }
 
+do_build() {
+	export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
+	ant clean all
+}
+
 do_install() {
-	vmkdir opt/yacy
-	vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+	vmkdir var/lib/yacy
+	vcopy $XBPS_BUILDDIR/yacy-1.922/* var/lib/yacy
 }
 
 post_install() {

Re: New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 278 bytes --]

New comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#issuecomment-662173998

Comment:
I made some updates such as to the path. I hope I didn't botch the commit trail trying to remove my mistaken google-earth-pro commits.

Re: New package: yacy-1.922

[fosslinux]

[-- Attachment #1: Type: text/plain, Size: 279 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#issuecomment-662175903

Comment:
Ok, looking better. I'll test this soon ish. The merge commit should not be kept, use rebase instead. Not sure how to remove that though

Re: New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 274 bytes --]

New comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#issuecomment-662555187

Comment:
Anything new on this? Do you want me to close out and start a new pull request since this one has dirty commit history? Thank you.

Re: New package: yacy-1.922

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 369 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#issuecomment-662561129

Comment:
@jason1987d you can run `git rebase -i HEAD~9` (where 9 is the number of commits you have here) and replace `pick` with `squash` for all of them. Then you just need to fix the final commit message and force push the branch here.

Re: New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 431 bytes --]

New comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#issuecomment-662571517

Comment:
> @jason1987d you can run `git rebase -i HEAD~9` (where 9 is the number of commits you have here) and replace `pick` with `squash` for all of them. Then you just need to fix the final commit message and force push the branch here.

That did not work. 
fatal: invalid upstream 'HEAD-9'

Re: New package: yacy-1.922

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 158 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#issuecomment-662583018

Comment:
It's `~`, not `-`

Re: New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 290 bytes --]

New comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#issuecomment-662587914

Comment:
Didn't see that ~ vs - at first, thank you. I have done plenty of squashing, but nothing seems to change here on the commits in this pull request.

Re: New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 384 bytes --]

New comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#issuecomment-662587914

Comment:
Didn't see that ~ vs - at first, thank you. I have done plenty of squashing, but nothing seems to change here on the commits in this pull request. I also see below here the mssage "This branch cannot be rebased due to conflicts".... normal?

Re: New package: yacy-1.922

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 328 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#issuecomment-662589114

Comment:
Not exactly. Can you check if `git log` shows all the commits that are in https://github.com/void-linux/void-packages/pull/23695/commits ? If not, you can run `git push -f origin master`.

Re: New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 188 bytes --]

New comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#issuecomment-662590095

Comment:
Looking at git log does show these commits. 

Re: [PR PATCH] [Updated] New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages master
https://github.com/void-linux/void-packages/pull/23695

New package: yacy-1.922


A patch file from https://github.com/void-linux/void-packages/pull/23695.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-23695.patch --]
[-- Type: text/x-diff, Size: 11810 bytes --]

From 4fd71c809b1c31e2dabe93e116948b7526106936 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 16:38:46 -0500
Subject: [PATCH 1/9] New package: yacy-1.922

---
 srcpkgs/yacy/files/yacy/run |  2 ++
 srcpkgs/yacy/template       | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 srcpkgs/yacy/files/yacy/run
 create mode 100644 srcpkgs/yacy/template

diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..594bcc2a3c8
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..02b9259024b
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,30 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+archs="x86_64"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/opt/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/opt/yacy 0755 yacy yacy"
+
+post_extract() {
+mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+}
+
+do_install() {
+vmkdir opt/yacy
+vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+}
+
+post_install() {
+vsv yacy
+}

From 4f6c60fd783f918a095444a32c6d637bf612fcc4 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 17:36:20 -0500
Subject: [PATCH 2/9] google-earth-pro: update to 7.3.3.7721

---
 srcpkgs/google-earth-pro/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..68927d21731 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
 license="Google"
 repository=nonfree
 restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
 
 nostrip=yes
 

From f7ef58a73d1635afcc9734a27439b677ea165b43 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:08:51 -0500
Subject: [PATCH 3/9] yacy: remove arch restriction

---
 srcpkgs/yacy/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 02b9259024b..5f8534c21ef 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -2,7 +2,6 @@
 pkgname=yacy
 version=1.922
 revision=1
-archs="x86_64"
 depends="openjdk-jre"
 short_desc="YaCy p2p decentralized search engine"
 maintainer="Jason Manley <jason@jasondavid.tv>"

From fe345d6bef848046987c4c8c131dd9d61944cfb9 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:14:56 -0500
Subject: [PATCH 4/9] Revert "google-earth-pro: update to 7.3.3.7721"

This reverts commit 4f6c60fd783f918a095444a32c6d637bf612fcc4.
---
 srcpkgs/google-earth-pro/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 68927d21731..41763ae7d25 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.3.7721
+version=7.3.2.5494
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Jason Manley <jason@jasondavid.tv>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Google"
 repository=nonfree
 restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
 
 nostrip=yes
 

From 5180ee51bb32f9468c6dba0d9939ad9b1145450f Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:17:31 -0500
Subject: [PATCH 5/9] Add indentation to do_install step.

---
 srcpkgs/yacy/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 5f8534c21ef..86b2adc23c8 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -16,14 +16,14 @@ yacy_shell="/bin/bash"
 make_dirs="/opt/yacy 0755 yacy yacy"
 
 post_extract() {
-mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+	mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
 }
 
 do_install() {
-vmkdir opt/yacy
-vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+	vmkdir opt/yacy
+	vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
 }
 
 post_install() {
-vsv yacy
+	vsv yacy
 }

From 81598c4dba58cb2ab6f554c899dac50ccd551dfe Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 19:17:04 -0500
Subject: [PATCH 6/9] yacy: change path to /var/lib/yacy and other fixes.

---
 srcpkgs/yacy/files/yacy/run |  2 +-
 srcpkgs/yacy/template       | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
index 594bcc2a3c8..c5544513c35 100644
--- a/srcpkgs/yacy/files/yacy/run
+++ b/srcpkgs/yacy/files/yacy/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
+exec chpst -u yacy:yacy /var/lib/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 86b2adc23c8..3d3ad7e438f 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -2,6 +2,7 @@
 pkgname=yacy
 version=1.922
 revision=1
+hostmakedepends="openjdk apache-ant"
 depends="openjdk-jre"
 short_desc="YaCy p2p decentralized search engine"
 maintainer="Jason Manley <jason@jasondavid.tv>"
@@ -11,17 +12,22 @@ distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
 checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
 
 system_accounts="yacy"
-yacy_homedir="/opt/yacy"
+yacy_homedir="/var/lib/yacy"
 yacy_shell="/bin/bash"
-make_dirs="/opt/yacy 0755 yacy yacy"
+make_dirs="/var/lib/yacy 0755 yacy yacy"
 
 post_extract() {
 	mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
 }
 
+do_build() {
+	export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
+	ant clean all
+}
+
 do_install() {
-	vmkdir opt/yacy
-	vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+	vmkdir var/lib/yacy
+	vcopy $XBPS_BUILDDIR/yacy-1.922/* var/lib/yacy
 }
 
 post_install() {

From dccc228f282f23d5a26e7fa04dbb2188e7769dda Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 18:17:31 -0500
Subject: [PATCH 7/9] Add indentation to do_install step.

---
 srcpkgs/yacy/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 5f8534c21ef..86b2adc23c8 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -16,14 +16,14 @@ yacy_shell="/bin/bash"
 make_dirs="/opt/yacy 0755 yacy yacy"
 
 post_extract() {
-mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+	mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
 }
 
 do_install() {
-vmkdir opt/yacy
-vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+	vmkdir opt/yacy
+	vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
 }
 
 post_install() {
-vsv yacy
+	vsv yacy
 }

From e87c8ecf609017c3a7b4ae9327177732b8a80ddd Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 19:17:04 -0500
Subject: [PATCH 8/9] yacy: change path to /var/lib/yacy and other fixes.

---
 srcpkgs/yacy/files/yacy/run |  2 +-
 srcpkgs/yacy/template       | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
index 594bcc2a3c8..c5544513c35 100644
--- a/srcpkgs/yacy/files/yacy/run
+++ b/srcpkgs/yacy/files/yacy/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec chpst -u yacy:yacy /opt/yacy/startYACY.sh -f
+exec chpst -u yacy:yacy /var/lib/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 86b2adc23c8..3d3ad7e438f 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -2,6 +2,7 @@
 pkgname=yacy
 version=1.922
 revision=1
+hostmakedepends="openjdk apache-ant"
 depends="openjdk-jre"
 short_desc="YaCy p2p decentralized search engine"
 maintainer="Jason Manley <jason@jasondavid.tv>"
@@ -11,17 +12,22 @@ distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
 checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
 
 system_accounts="yacy"
-yacy_homedir="/opt/yacy"
+yacy_homedir="/var/lib/yacy"
 yacy_shell="/bin/bash"
-make_dirs="/opt/yacy 0755 yacy yacy"
+make_dirs="/var/lib/yacy 0755 yacy yacy"
 
 post_extract() {
 	mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
 }
 
+do_build() {
+	export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
+	ant clean all
+}
+
 do_install() {
-	vmkdir opt/yacy
-	vcopy $XBPS_BUILDDIR/yacy-1.922/* opt/yacy
+	vmkdir var/lib/yacy
+	vcopy $XBPS_BUILDDIR/yacy-1.922/* var/lib/yacy
 }
 
 post_install() {

From 8072211874efd4019a74316c725edd01ae4598d5 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 21 Jul 2020 16:38:46 -0500
Subject: [PATCH 9/9] New package: yacy-1.922

---
 srcpkgs/yacy/files/yacy/run |  2 ++
 srcpkgs/yacy/template       | 40 +++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 srcpkgs/yacy/files/yacy/run
 create mode 100644 srcpkgs/yacy/template

diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..c5544513c35
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /var/lib/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..a6472017379
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,40 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+hostmakedepends="openjdk apache-ant"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/var/lib/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/var/lib/yacy 0755 yacy yacy"
+
+post_extract() {
+	mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+}
+
+do_build() {
+	export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
+	ant clean all
+}
+
+do_install() {
+	vmkdir var/lib/yacy
+	vcopy $XBPS_BUILDDIR/yacy-1.922/* var/lib/yacy
+}
+
+do_install() {
+	vmkdir var/lib/yacy
+	vcopy $XBPS_BUILDDIR/yacy-1.922/* var/lib/yacy
+}
+
+post_install() {
+	vsv yacy
+}

Re: New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 418 bytes --]

New comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#issuecomment-662595022

Comment:
Each attempt at a squash just mangles the main template file with random git gibberish. What am I doing wrong here? Is it okay if I close this pull request and start fresh with just the one commit now that we've discussed and fixed what was actually wrong with the template?

Re: New package: yacy-1.922

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 146 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#issuecomment-662601037

Comment:
Sure.

Re: [PR PATCH] [Closed]: New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 157 bytes --]

There's a closed pull request on the void-packages repository

New package: yacy-1.922
https://github.com/void-linux/void-packages/pull/23695

Description:

Re: New package: yacy-1.922

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 337 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/23695#issuecomment-663226818

Comment:
> Is it okay if I close this pull request and start fresh with just the one commit

It is preferred to make changes as for new PR, then `git push --force FORK NEW_BRANCH:BRANCH_OF_EXISTING_PR`

Re: [PR PATCH] [Updated] New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages yacy-1.922
https://github.com/void-linux/void-packages/pull/23742

New package: yacy-1.922


A patch file from https://github.com/void-linux/void-packages/pull/23742.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yacy-1.922-23742.patch --]
[-- Type: text/x-diff, Size: 2656 bytes --]

From e613bac9b0b8f3e1d784d369b94f668887f4fe14 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:17:10 -0500
Subject: [PATCH 1/2] New package: yacy-1.922

---
 srcpkgs/yacy/INSTALL        |  6 ++++++
 srcpkgs/yacy/files/yacy/run |  2 ++
 srcpkgs/yacy/template       | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 srcpkgs/yacy/INSTALL
 create mode 100644 srcpkgs/yacy/files/yacy/run
 create mode 100644 srcpkgs/yacy/template

diff --git a/srcpkgs/yacy/INSTALL b/srcpkgs/yacy/INSTALL
new file mode 100644
index 00000000000..e451fab90ce
--- /dev/null
+++ b/srcpkgs/yacy/INSTALL
@@ -0,0 +1,6 @@
+# INSTALL
+case "$ACTION" in
+post)
+	chown -R yacy:yacy /var/lib/yacy
+	;;
+esac
diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..c5544513c35
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /var/lib/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..19ba9cdd425
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,32 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+wrksrc=${pkgname}
+hostmakedepends="openjdk apache-ant"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/var/lib/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/var/lib/yacy 0755 yacy yacy"
+
+do_build() {
+	export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
+	ant clean all
+}
+
+do_install() {
+	vmkdir var/lib/
+	vcopy ${wrksrc} var/lib/
+}
+
+post_install() {
+	vsv yacy
+}

From b36a760c4edb642c3c98be52888c1a2672172f29 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Tue, 2 Mar 2021 13:48:19 -0600
Subject: [PATCH 2/2] New package: yacy-1.922.

---
 srcpkgs/yacy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
index 19ba9cdd425..67e84f1d692 100644
--- a/srcpkgs/yacy/template
+++ b/srcpkgs/yacy/template
@@ -4,7 +4,7 @@ version=1.922
 revision=1
 wrksrc=${pkgname}
 hostmakedepends="openjdk apache-ant"
-depends="openjdk-jre"
+depends="openjdk-jre bash"
 short_desc="YaCy p2p decentralized search engine"
 maintainer="Jason Manley <jason@jasondavid.tv>"
 license="GPL-3.0-or-later"

Re: [PR PATCH] [Updated] New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages yacy-1.922
https://github.com/void-linux/void-packages/pull/23742

New package: yacy-1.922


A patch file from https://github.com/void-linux/void-packages/pull/23742.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yacy-1.922-23742.patch --]
[-- Type: text/x-diff, Size: 1942 bytes --]

From e613bac9b0b8f3e1d784d369b94f668887f4fe14 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:17:10 -0500
Subject: [PATCH] New package: yacy-1.922

---
 srcpkgs/yacy/INSTALL        |  6 ++++++
 srcpkgs/yacy/files/yacy/run |  2 ++
 srcpkgs/yacy/template       | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 srcpkgs/yacy/INSTALL
 create mode 100644 srcpkgs/yacy/files/yacy/run
 create mode 100644 srcpkgs/yacy/template

diff --git a/srcpkgs/yacy/INSTALL b/srcpkgs/yacy/INSTALL
new file mode 100644
index 00000000000..e451fab90ce
--- /dev/null
+++ b/srcpkgs/yacy/INSTALL
@@ -0,0 +1,6 @@
+# INSTALL
+case "$ACTION" in
+post)
+	chown -R yacy:yacy /var/lib/yacy
+	;;
+esac
diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..c5544513c35
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /var/lib/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..19ba9cdd425
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,32 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+wrksrc=${pkgname}
+hostmakedepends="openjdk apache-ant"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/var/lib/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/var/lib/yacy 0755 yacy yacy"
+
+do_build() {
+	export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
+	ant clean all
+}
+
+do_install() {
+	vmkdir var/lib/
+	vcopy ${wrksrc} var/lib/
+}
+
+post_install() {
+	vsv yacy
+}

Re: [PR PATCH] [Updated] New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages yacy-1.922
https://github.com/void-linux/void-packages/pull/23742

New package: yacy-1.922


A patch file from https://github.com/void-linux/void-packages/pull/23742.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yacy-1.922-23742.patch --]
[-- Type: text/x-diff, Size: 1611 bytes --]

From c21627b98858e669859c9c16066b7937034a99da Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:17:10 -0500
Subject: [PATCH] New package: yacy-1.922

---
 srcpkgs/yacy/files/yacy/run |  2 ++
 srcpkgs/yacy/template       | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 srcpkgs/yacy/files/yacy/run
 create mode 100644 srcpkgs/yacy/template

diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..c5544513c35
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /var/lib/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..19ba9cdd425
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,32 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+wrksrc=${pkgname}
+hostmakedepends="openjdk apache-ant"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/var/lib/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/var/lib/yacy 0755 yacy yacy"
+
+do_build() {
+	export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
+	ant clean all
+}
+
+do_install() {
+	vmkdir var/lib/
+	vcopy ${wrksrc} var/lib/
+}
+
+post_install() {
+	vsv yacy
+}

Re: [PR PATCH] [Updated] New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages yacy-1.922
https://github.com/void-linux/void-packages/pull/23742

New package: yacy-1.922


A patch file from https://github.com/void-linux/void-packages/pull/23742.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yacy-1.922-23742.patch --]
[-- Type: text/x-diff, Size: 1615 bytes --]

From 6f53d3724b5844b70422c7fd9747553166e4f3d3 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:17:10 -0500
Subject: [PATCH] New package: yacy-1.922

---
 srcpkgs/yacy/files/yacy/run |  2 ++
 srcpkgs/yacy/template       | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 srcpkgs/yacy/files/yacy/run
 create mode 100644 srcpkgs/yacy/template

diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..c5544513c35
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /var/lib/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..10131a8ae19
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,32 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+wrksrc=${pkgname}
+hostmakedepends="openjdk apache-ant"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/var/lib/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/var/lib/yacy 0755 yacy yacy"
+
+do_build() {
+	export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
+	ant clean all
+}
+
+do_install() {
+	vmkdir var/lib/yacy
+	vcopy ${wrksrc} var/lib/
+}
+
+post_install() {
+	vsv yacy
+}

Re: [PR PATCH] [Updated] New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages yacy-1.922
https://github.com/void-linux/void-packages/pull/23742

New package: yacy-1.922


A patch file from https://github.com/void-linux/void-packages/pull/23742.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yacy-1.922-23742.patch --]
[-- Type: text/x-diff, Size: 1598 bytes --]

From 845e56dcfab8e2a2703e8afe89f630a934c5debe Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:17:10 -0500
Subject: [PATCH] New package: yacy-1.922

---
 srcpkgs/yacy/files/yacy/run |  2 ++
 srcpkgs/yacy/template       | 31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 srcpkgs/yacy/files/yacy/run
 create mode 100644 srcpkgs/yacy/template

diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..c5544513c35
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /var/lib/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..974e137b0f4
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,31 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+wrksrc=${pkgname}
+hostmakedepends="openjdk apache-ant"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/var/lib/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/var/lib/yacy 0755 yacy yacy"
+
+do_build() {
+	export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
+	ant clean all
+}
+
+do_install() {
+	vcopy ${wrksrc}/* var/lib/yacy
+}
+
+post_install() {
+	vsv yacy
+}

Re: [PR PATCH] [Updated] New package: yacy-1.922

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages yacy-1.922
https://github.com/void-linux/void-packages/pull/23742

New package: yacy-1.922


A patch file from https://github.com/void-linux/void-packages/pull/23742.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yacy-1.922-23742.patch --]
[-- Type: text/x-diff, Size: 1684 bytes --]

From 7795ff338d51ff6de3ec2a931bc3e46a007d433b Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:17:10 -0500
Subject: [PATCH] New package: yacy-1.922

---
 srcpkgs/yacy/files/yacy/run |  2 ++
 srcpkgs/yacy/template       | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 srcpkgs/yacy/files/yacy/run
 create mode 100644 srcpkgs/yacy/template

diff --git a/srcpkgs/yacy/files/yacy/run b/srcpkgs/yacy/files/yacy/run
new file mode 100644
index 00000000000..c5544513c35
--- /dev/null
+++ b/srcpkgs/yacy/files/yacy/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u yacy:yacy /var/lib/yacy/startYACY.sh -f
diff --git a/srcpkgs/yacy/template b/srcpkgs/yacy/template
new file mode 100644
index 00000000000..3d3ad7e438f
--- /dev/null
+++ b/srcpkgs/yacy/template
@@ -0,0 +1,35 @@
+# Template file for 'yacy'
+pkgname=yacy
+version=1.922
+revision=1
+hostmakedepends="openjdk apache-ant"
+depends="openjdk-jre"
+short_desc="YaCy p2p decentralized search engine"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://yacy.net"
+distfiles="http://latest.yacy.net/yacy_v${version}_20191013_9964.tar.gz"
+checksum=@99af963642dafaeab2657ad59315e7b7896bf4c1e7091f8f67e95e71802d44df
+
+system_accounts="yacy"
+yacy_homedir="/var/lib/yacy"
+yacy_shell="/bin/bash"
+make_dirs="/var/lib/yacy 0755 yacy yacy"
+
+post_extract() {
+	mv ${XBPS_BUILDDIR}/{yacy,yacy-1.922}
+}
+
+do_build() {
+	export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
+	ant clean all
+}
+
+do_install() {
+	vmkdir var/lib/yacy
+	vcopy $XBPS_BUILDDIR/yacy-1.922/* var/lib/yacy
+}
+
+post_install() {
+	vsv yacy
+}