revbump grok and add missing.16

Signed-off-by: Paul Healy <lmiphay@gmail.com>

3 files changed, 252 insertions, 0 deletions

diff --git a/www-apps/opengrok-bin/Manifest b/www-apps/opengrok-bin/Manifest
index 7c1db6b..661f70d 100644
--- a/www-apps/opengrok-bin/Manifest
+++ b/www-apps/opengrok-bin/Manifest
@@ -5,6 +5,7 @@ DIST opengrok-1.2.14.tar.gz 45795021 BLAKE2B f27f0ee5ed1a86a488db3a04402f27b59b1
 DIST opengrok-1.2.15.tar.gz 45797633 BLAKE2B 742bc0612d0bdd0f25c1bb86e091d8d2e1044c98cf59496cedccae37f5d4f15ec282c204927f477e441d11e178de1f7dcdbf152c7f26e5d4daadee8b9acf27cd SHA512 8b72e25be00558e3dd687262e34149579faaf79615e2ff24e1f9d3f1ef0c66dfc1173ec2b5c9eb85a518a157dbdcb2090a50f6a272f6fe083ca3f421d76f40a1
 DIST opengrok-1.2.16.tar.gz 45824485 BLAKE2B 5e2d4a228fbd85c65e7b8cdca5503bef739025cb678386b4185fd856090af68c0e28225ace745fb80a7e0aca9d2e0869374ecccf0357f747e7c4eaffb387bea6 SHA512 4d84ce1fc1938c3f473f95c28c35a4bfba996064a610e33f692cbda33a2dfd376d5ad56b990cc9fc9f3eb36c95a5b4118816d38c700a736630fd27c8dd6aef13
 DIST opengrok-1.2.17.tar.gz 45822909 BLAKE2B d3dde80716eaa58d817f3a1a2bed4f00b88b6fccd6e995873fb06a3094bc311d4de309f3854eb70e5a6aa640dc1f147780ce887373f8980faa150d6b457c84dc SHA512 861a26b55d59fbb5b95f511f80d265c2e85abb8196b07386c7f01cccfaddb0d305fea8f842e24a975b174e3a76711adf29fd80bad3a493ca265b8bd4f5184c13
+DIST opengrok-1.2.22.tar.gz 45836211 BLAKE2B a55376251e270e3937aecbd01c7f05ad509d2fe33617db5be9203a1d5cb974f01715248e4111ef05a35333dbd00bcd6fda8a3c9599e530e1a13c1046376d8161 SHA512 d6523a29bcce775ba02760d71076c5c5de32778e184c3c9f4dce6192ad3297431f1f94964d359c9a9d882944ca7d71d9ed259eae0a6ffcb7f81d35db429083ef
 DIST opengrok-1.2.7.tar.gz 45302444 BLAKE2B 54a31a9aabb4b74ab5cb118b8d8e01887b22a292dbd01a37f7c0add298376a7842a5c89dfc92df5d0e94e3b1a8dea5078ccdb7f72c7de4ff19936a1b0f98ac0c SHA512 fa337c28fa3795711b05e00cd06a8f764247ca659e50032a6f0349c9765dd99ffb0f6213e05b53a598dbf7aa965dbdceae3a05335f7644fe9b5148f2a4b7da33
 DIST opengrok-1.2.8.tar.gz 45315164 BLAKE2B b533d10b4193b0ed8af1b6bc4c410b517988930ff44e0811cef479f7e6bd563364e65650427e8ce1f2d0ffabc9a28235cf6a24ec7b0cc9a1602a3ae453417650 SHA512 69ac49c4f76c3f92ff4b21995775cf151acaf12d36ebb3a757bf5d5d29944460bffa609a3b0caeb6ab751aa0cb78ec5772c153589f34f48c798d8c2cf678ec58
 DIST opengrok-1.2.9.tar.gz 45822173 BLAKE2B e72a6f953cf43660cad79776fc3d638d07984f625ba69886964e476771967e4c8022241f7c3e51cc3555b712fb7f65fbad57af68d98e017803da213f80e67bc4 SHA512 90a1eeae4fdb8027a67202ab0ee47b9d6f939b6d380bd74f586d316e9a275650b8282434cb30d2dfda991ba284723aa39376ed866baffec44976e66875db9016
@@ -14,6 +15,7 @@ EBUILD opengrok-bin-1.2.14.ebuild 3702 BLAKE2B 11754446f67b2d4264592345819c471b9
 EBUILD opengrok-bin-1.2.15.ebuild 3702 BLAKE2B 11754446f67b2d4264592345819c471b949eae41930adcd3b66a900f607b272c26a7a1025899346dec92e4559cefc1abd665edeacb24f1116dc5886b4c283c45 SHA512 eeec117ff1c8bc94fc8dfdee99552ac28b82c3af427ddb5c410b4ed436bac4063d14bb716bcabdc3164d5e92372f02d7fb0b04810bf389574bf2f97a78503378
 EBUILD opengrok-bin-1.2.16.ebuild 3702 BLAKE2B 11754446f67b2d4264592345819c471b949eae41930adcd3b66a900f607b272c26a7a1025899346dec92e4559cefc1abd665edeacb24f1116dc5886b4c283c45 SHA512 eeec117ff1c8bc94fc8dfdee99552ac28b82c3af427ddb5c410b4ed436bac4063d14bb716bcabdc3164d5e92372f02d7fb0b04810bf389574bf2f97a78503378
 EBUILD opengrok-bin-1.2.17.ebuild 3702 BLAKE2B 11754446f67b2d4264592345819c471b949eae41930adcd3b66a900f607b272c26a7a1025899346dec92e4559cefc1abd665edeacb24f1116dc5886b4c283c45 SHA512 eeec117ff1c8bc94fc8dfdee99552ac28b82c3af427ddb5c410b4ed436bac4063d14bb716bcabdc3164d5e92372f02d7fb0b04810bf389574bf2f97a78503378
+EBUILD opengrok-bin-1.2.22.ebuild 3702 BLAKE2B 11754446f67b2d4264592345819c471b949eae41930adcd3b66a900f607b272c26a7a1025899346dec92e4559cefc1abd665edeacb24f1116dc5886b4c283c45 SHA512 eeec117ff1c8bc94fc8dfdee99552ac28b82c3af427ddb5c410b4ed436bac4063d14bb716bcabdc3164d5e92372f02d7fb0b04810bf389574bf2f97a78503378
 EBUILD opengrok-bin-1.2.7.ebuild 3702 BLAKE2B 11754446f67b2d4264592345819c471b949eae41930adcd3b66a900f607b272c26a7a1025899346dec92e4559cefc1abd665edeacb24f1116dc5886b4c283c45 SHA512 eeec117ff1c8bc94fc8dfdee99552ac28b82c3af427ddb5c410b4ed436bac4063d14bb716bcabdc3164d5e92372f02d7fb0b04810bf389574bf2f97a78503378
 EBUILD opengrok-bin-1.2.8.ebuild 3702 BLAKE2B 11754446f67b2d4264592345819c471b949eae41930adcd3b66a900f607b272c26a7a1025899346dec92e4559cefc1abd665edeacb24f1116dc5886b4c283c45 SHA512 eeec117ff1c8bc94fc8dfdee99552ac28b82c3af427ddb5c410b4ed436bac4063d14bb716bcabdc3164d5e92372f02d7fb0b04810bf389574bf2f97a78503378
 EBUILD opengrok-bin-1.2.9.ebuild 3702 BLAKE2B 11754446f67b2d4264592345819c471b949eae41930adcd3b66a900f607b272c26a7a1025899346dec92e4559cefc1abd665edeacb24f1116dc5886b4c283c45 SHA512 eeec117ff1c8bc94fc8dfdee99552ac28b82c3af427ddb5c410b4ed436bac4063d14bb716bcabdc3164d5e92372f02d7fb0b04810bf389574bf2f97a78503378
diff --git a/www-apps/opengrok-bin/opengrok-bin-1.2.16.ebuild b/www-apps/opengrok-bin/opengrok-bin-1.2.16.ebuild
new file mode 100644
index 0000000..4e57fa7
--- /dev/null
+++ b/www-apps/opengrok-bin/opengrok-bin-1.2.16.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit eutils user distutils-r1
+
+MY_PN="${PN/-bin/}"
+# 1.1_rc2 -> 1.1-rc2
+MY_PV="${PV}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Fast source code search and cross reference engine"
+HOMEPAGE="http://opengrok.github.io/OpenGrok/"
+SRC_URI="https://github.com/OpenGrok/OpenGrok/releases/download/${MY_PV}/${MY_P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64"
+# use cssc for SCCS support
+IUSE="cssc subversion"
+
+TOMCAT=9
+
+BDEPEND="
+	dev-python/pytest-runner[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-util/ctags-5.8
+	www-servers/tomcat:${TOMCAT}
+	cssc? ( dev-vcs/cssc )
+	subversion? ( >=dev-vcs/subversion-1.9.5[java] )
+"
+
+INSTALL_DIR="/opt/${MY_PN}"
+OPENGROK_DIR="/var/${MY_PN}"
+ETC_DIR="${OPENGROK_DIR}/etc"
+SRC_DIR="${OPENGROK_DIR}/src"
+USER_ID="opengrok"
+GROUP_ID="opengrok"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( "doc/README.md" "doc/logging.properties" )
+
+pkg_setup() {
+	enewgroup "${GROUP_ID}"
+	enewuser "${USER_ID}" -1 -1 -1 "${GROUP_ID}"
+}
+
+src_unpack() {
+	default
+	cd "${S}" && tar -xf tools/opengrok-tools.tar.gz || die
+}
+
+python_prepare_all() {
+	mv opengrok-tools-*/* . || die
+
+	sed -i '/resource/d' 'opengrok_tools.egg-info/requires.txt' || die
+	sed -i "/'resource'/d" 'setup.py' || die
+	sed -i "/'pytest-runner',/d" 'setup.py' || die
+
+	# force the finding of ctags (exuberant version is installed as ctags on gentoo)
+	sed -i -e "s:'universal-ctags', ::" src/main/python/opengrok_tools/utils/indexer.py || die
+
+	sed -i -e '1,2d' man/man1/opengrok.1 || die
+	# manpage sed based on Fedora opengrok.spec by Lubomir Kundrak
+	sed 's,^<!DOCTYPE.*,<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "docbookx.dtd">,
+		 s,^<?Pub Inc>,,
+		 s,^<command>opengrok,<command>opengrok</command>,
+		 s,^<optional><option>,<arg><option>,
+		 s,</option></optional>,</option></arg>,
+		 s,^</command>,,' man/man1/opengrok.1 | \
+		xsltproc /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl -
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	doman opengrok.1
+
+	dodir "${INSTALL_DIR}"
+	cp -pRP lib share "${ED}/${INSTALL_DIR}" || die
+
+	diropts -m 0775 -o ${USER_ID} -g ${GROUP_ID}
+	keepdir "${ETC_DIR}" "${SRC_DIR}"
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Create a tomcat instance to host opengrok, see: https://wiki.gentoo.org/wiki/Apache_Tomcat"
+	elog "e.g. /usr/share/tomcat-${TOMCAT}/gentoo/tomcat-instance-manager.bash --create"
+	elog ""
+	elog "Deploy the web app, example:"
+	elog "   opengrok-deploy ${INSTALL_DIR}/lib/source.war /var/lib/tomcat-${TOMCAT}/webapps"
+	elog ""
+	elog "Index the source directory (${SRC_DIR}), example:"
+	elog "   opengrok-indexer -j /usr/bin/java -a ${INSTALL_DIR}/lib/opengrok.jar -- \ "
+	elog "       --source ${SRC_DIR} --dataRoot ${OPENGROK_DIR}/data \ "
+	elog "       --writeConfig ${OPENGROK_DIR}/etc/configuration.xml --host http://127.0.0.1:8080"
+	elog ""
+	elog "If you need to specify JAVA_HOME: export JAVA_HOME=\$(java-config-2 --jdk-home)"
+	elog ""
+	elog "Browse to: http://YOUR_WEBAPP_SERVER:WEBAPPSRV_PORT/source"
+	elog "e.g. http://localhost:8080/source/"
+	elog ""
+	elog "Restart tomcat if you get an application not-found on first installation:"
+	elog "e.g. /etc/init.d/tomcat-${TOMCAT} restart"
+	elog ""
+	elog "Release notes at: https://github.com/OpenGrok/OpenGrok/releases"
+}
diff --git a/www-apps/opengrok-bin/opengrok-bin-1.2.22.ebuild b/www-apps/opengrok-bin/opengrok-bin-1.2.22.ebuild
new file mode 100644
index 0000000..4e57fa7
--- /dev/null
+++ b/www-apps/opengrok-bin/opengrok-bin-1.2.22.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit eutils user distutils-r1
+
+MY_PN="${PN/-bin/}"
+# 1.1_rc2 -> 1.1-rc2
+MY_PV="${PV}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Fast source code search and cross reference engine"
+HOMEPAGE="http://opengrok.github.io/OpenGrok/"
+SRC_URI="https://github.com/OpenGrok/OpenGrok/releases/download/${MY_PV}/${MY_P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64"
+# use cssc for SCCS support
+IUSE="cssc subversion"
+
+TOMCAT=9
+
+BDEPEND="
+	dev-python/pytest-runner[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-util/ctags-5.8
+	www-servers/tomcat:${TOMCAT}
+	cssc? ( dev-vcs/cssc )
+	subversion? ( >=dev-vcs/subversion-1.9.5[java] )
+"
+
+INSTALL_DIR="/opt/${MY_PN}"
+OPENGROK_DIR="/var/${MY_PN}"
+ETC_DIR="${OPENGROK_DIR}/etc"
+SRC_DIR="${OPENGROK_DIR}/src"
+USER_ID="opengrok"
+GROUP_ID="opengrok"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( "doc/README.md" "doc/logging.properties" )
+
+pkg_setup() {
+	enewgroup "${GROUP_ID}"
+	enewuser "${USER_ID}" -1 -1 -1 "${GROUP_ID}"
+}
+
+src_unpack() {
+	default
+	cd "${S}" && tar -xf tools/opengrok-tools.tar.gz || die
+}
+
+python_prepare_all() {
+	mv opengrok-tools-*/* . || die
+
+	sed -i '/resource/d' 'opengrok_tools.egg-info/requires.txt' || die
+	sed -i "/'resource'/d" 'setup.py' || die
+	sed -i "/'pytest-runner',/d" 'setup.py' || die
+
+	# force the finding of ctags (exuberant version is installed as ctags on gentoo)
+	sed -i -e "s:'universal-ctags', ::" src/main/python/opengrok_tools/utils/indexer.py || die
+
+	sed -i -e '1,2d' man/man1/opengrok.1 || die
+	# manpage sed based on Fedora opengrok.spec by Lubomir Kundrak
+	sed 's,^<!DOCTYPE.*,<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "docbookx.dtd">,
+		 s,^<?Pub Inc>,,
+		 s,^<command>opengrok,<command>opengrok</command>,
+		 s,^<optional><option>,<arg><option>,
+		 s,</option></optional>,</option></arg>,
+		 s,^</command>,,' man/man1/opengrok.1 | \
+		xsltproc /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl -
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	doman opengrok.1
+
+	dodir "${INSTALL_DIR}"
+	cp -pRP lib share "${ED}/${INSTALL_DIR}" || die
+
+	diropts -m 0775 -o ${USER_ID} -g ${GROUP_ID}
+	keepdir "${ETC_DIR}" "${SRC_DIR}"
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Create a tomcat instance to host opengrok, see: https://wiki.gentoo.org/wiki/Apache_Tomcat"
+	elog "e.g. /usr/share/tomcat-${TOMCAT}/gentoo/tomcat-instance-manager.bash --create"
+	elog ""
+	elog "Deploy the web app, example:"
+	elog "   opengrok-deploy ${INSTALL_DIR}/lib/source.war /var/lib/tomcat-${TOMCAT}/webapps"
+	elog ""
+	elog "Index the source directory (${SRC_DIR}), example:"
+	elog "   opengrok-indexer -j /usr/bin/java -a ${INSTALL_DIR}/lib/opengrok.jar -- \ "
+	elog "       --source ${SRC_DIR} --dataRoot ${OPENGROK_DIR}/data \ "
+	elog "       --writeConfig ${OPENGROK_DIR}/etc/configuration.xml --host http://127.0.0.1:8080"
+	elog ""
+	elog "If you need to specify JAVA_HOME: export JAVA_HOME=\$(java-config-2 --jdk-home)"
+	elog ""
+	elog "Browse to: http://YOUR_WEBAPP_SERVER:WEBAPPSRV_PORT/source"
+	elog "e.g. http://localhost:8080/source/"
+	elog ""
+	elog "Restart tomcat if you get an application not-found on first installation:"
+	elog "e.g. /etc/init.d/tomcat-${TOMCAT} restart"
+	elog ""
+	elog "Release notes at: https://github.com/OpenGrok/OpenGrok/releases"
+}