commit:     3499bf2d0e84f335701f355829cf292ab74b1afc
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 12 20:54:51 2017 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Wed Jul 12 22:05:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3499bf2d

dev-util/artifactory-bin: remove old

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-util/artifactory-bin/Manifest                  |  20 ---
 .../artifactory-bin/artifactory-bin-4.10.0.ebuild  |  96 ------------
 .../artifactory-bin/artifactory-bin-4.11.0.ebuild  |  96 ------------
 .../artifactory-bin/artifactory-bin-4.11.1.ebuild  |  96 ------------
 .../artifactory-bin/artifactory-bin-4.11.2.ebuild  |  96 ------------
 .../artifactory-bin-4.12.0.1.ebuild                |  96 ------------
 .../artifactory-bin/artifactory-bin-4.12.1.ebuild  |  96 ------------
 .../artifactory-bin/artifactory-bin-4.12.2.ebuild  |  96 ------------
 .../artifactory-bin/artifactory-bin-4.13.0.ebuild  |  96 ------------
 .../artifactory-bin/artifactory-bin-4.13.1.ebuild  |  96 ------------
 .../artifactory-bin/artifactory-bin-4.13.2.ebuild  |  96 ------------
 .../artifactory-bin-4.14.0-r1.ebuild               |  96 ------------
 .../artifactory-bin/artifactory-bin-4.14.0.ebuild  |  96 ------------
 .../artifactory-bin/artifactory-bin-4.14.1.ebuild  |  96 ------------
 .../artifactory-bin/artifactory-bin-4.14.2.ebuild  |  96 ------------
 .../artifactory-bin/artifactory-bin-4.16.0.ebuild  |  96 ------------
 .../artifactory-bin/artifactory-bin-4.7.6.ebuild   |  94 ------------
 .../artifactory-bin/artifactory-bin-4.7.7.ebuild   |  94 ------------
 .../artifactory-bin/artifactory-bin-4.8.0.ebuild   |  96 ------------
 .../artifactory-bin/artifactory-bin-4.8.1.ebuild   |  96 ------------
 .../artifactory-bin/artifactory-bin-4.8.2.ebuild   |  96 ------------
 .../artifactory-bin/artifactory-bin-4.9.0.ebuild   |  96 ------------
 .../artifactory-bin/artifactory-bin-4.9.1.ebuild   |  96 ------------
 dev-util/artifactory-bin/files/initd               | 165 ---------------------
 dev-util/artifactory-bin/files/initd-r1            | 165 ---------------------
 25 files changed, 2458 deletions(-)

diff --git a/dev-util/artifactory-bin/Manifest 
b/dev-util/artifactory-bin/Manifest
index 70f83f7fc72..30cf3df5ccd 100644
--- a/dev-util/artifactory-bin/Manifest
+++ b/dev-util/artifactory-bin/Manifest
@@ -1,21 +1 @@
-DIST artifactory-4.10.0.zip 41178841 SHA256 
949499822127506906589f88b887cc712931f95efcbc906584e1163e0976f058 SHA512 
72f5665faec48701b96ccfdf46f42512a82874a636b912bec21a1738828fe5d5f6712307380ede07c787a3778064ade13b8d9cbd18442f77454539836d4a7bcd
 WHIRLPOOL 
3afb4070946ddf83664edd98fa3c2288f359bb0f24fd8546750f4641ec4c391a84cdac9df3e383e9d4d8cf7baae48d67c4d0c8aea0a20aeae92273e4b8613d7e
-DIST artifactory-4.11.0.zip 41244801 SHA256 
3bb7f2409b8d779c60b8ce773501fefebe5af0146c65a26085bc07f52a0b7ae3 SHA512 
7c76cfcc8e040d3301a5a84805618089eb76683ed621fef7a094e4b4c9232d3b6730bb1de4375513895f5c8f8983070587ce2fdeb3f28a4dfa28206aa06f6517
 WHIRLPOOL 
abf18758f7ddc993c2c7bc1e39c33dc6b65c8f99ebfc6413ef8a1eac381f7c0bdf46b9c1768c8945813f6acff62774bae90a21911405dff8b621cda0db0c1798
-DIST artifactory-4.11.1.zip 41246363 SHA256 
88837e1542c03c5571ab908bf30d7cf222b6b87f2759a3d8db9cc60c31111f86 SHA512 
1cca679e0480d56e6e708708ac1571ae6e623d794655321accb206f4ae9693481a8875b18675c348fa48d8739f3b902004ea43f633864bdcfd662e3357e00887
 WHIRLPOOL 
e7222c78062222dc28fb8956da0b818ad6cdd15b922ef3150d20c2dc0ea336fa7c0bc40527d7be8fe73800855de5eb54ae5e4be357b2122d168fb121f2bdf24f
-DIST artifactory-4.11.2.zip 41256431 SHA256 
d765046bca9debf7bf1bdac391846fa767c9671ba95b2aeb32c7c73a88f42c33 SHA512 
f06b641359dbbda937e7dee05a0ac59a7ce713b2438046bf8b6cd9a4c87c2ad4a81ed1bb0cbb262b3dba7aea8543bdc6c6217dce559b8f4b239bccca399c4cc8
 WHIRLPOOL 
8e889d8a25c34caaca88b1d76ccb2a6b96deb46424bde525e3281726e6a5472e8050ab58392b85fc11d4cda8477c57946e063e6827290ebc4270c1e591c02725
-DIST artifactory-4.12.0.1.zip 41341922 SHA256 
463e6267fbc6f7f4393a6fd824d812d3989bf1f66ff062148d03e76fcbe2e097 SHA512 
5942d5f5f6ef5b6872b97118475bbb6d6f3df51f995265519ebece19323457f3a72191298e77c0cc092abd81b90db9bd86babc418a6fdf0004add85718383952
 WHIRLPOOL 
a003a3f43f9344498758481a4c6ec02df90d6e85b67d2b5700a53eb0b4ae5aa6ca30e8b7c172839dabce0ef371bf32fd1e2da025eea889eedeccbd446c699d4f
-DIST artifactory-4.12.1.zip 41353207 SHA256 
30dfa6cb9e5b1b8beb917fa7aacd76b54882d054edcc7a1b77761e3bef03bd82 SHA512 
e0974bc83259859964883a90b064a38736aa2cb59fba1eb34b96a7b48fd33c9f3d64f0624b7169e5b663daf31b0999e33e9bd1fde8a25f7eb8ef2e1fc47626ea
 WHIRLPOOL 
c9ce0bd1f0a5172a057e8c5f32312308e4cfaa4ae59496947b6a757f904b7ef8ac459e270af3df392398e49d68d0f4a6e542e2a8d89cc4fce05821d08122f40c
-DIST artifactory-4.12.2.zip 41341044 SHA256 
7b330eed2c53633bbe77e4ffaa1f7826bde57751e9c2be50884d4fb5e6cfa6f5 SHA512 
a5d35958263b58caf8971d2c67eb9417f576875f56ed302ffa1d1deffc4b7e0a2595b21ea077eabf4e42f12e947689b92f328ee887c6714317419a43a51b8cd7
 WHIRLPOOL 
8d79e189d4e9279a37dfb06c2b8413d3bad67da3626665e8eaf88af35c3b0b31e1f5e5498a332bf9fe218e0b02e1382357b90b48220c08479697480b51feada8
-DIST artifactory-4.13.0.zip 41369905 SHA256 
5724e879642ba393f3242f73fc2684d3eafb21dee80c8086ab566f5c99aa908d SHA512 
958d8c02ada6e140ed73279db4645869f56abe91a0f9c64777035e212c880e4b15659bf28a8055cf2f7e65c15cf429e0dd678bdee11a2ba18d11654c91500053
 WHIRLPOOL 
70b1c03463b99b83572d6e00dcf46b9f236e16b5d7eb83f0e8cb2a08cfa04d5757dda02fd28470212fbbe44ddabbd26b9b1a8085e2336661b9cd240d106882de
-DIST artifactory-4.13.1.zip 41392021 SHA256 
295463b4a6e6c9b1a8ddde6d62f03b206cba160b39bb6c0801f64e138e21bca2 SHA512 
2ebeb5d1c1746ca90be4de644ce7dacf81fa7aee68c9408560bda8546dbf78d366ccecbcfada46261897a49c7df7dda5d5da3b030d76cb8ea59162c73238b62e
 WHIRLPOOL 
37a7f00ceca80b648b7765aab3e7a7523d516ed77af87d0312d2e02626d41390281c52e2e42e35a76c025f3ce6c4643e173a509d410b927e7e46dc1c76b732a9
-DIST artifactory-4.13.2.zip 41396298 SHA256 
f228ac35bfc506754c64c45e7a86306434371b37daef0f361f76fc30c13d72cb SHA512 
8469a5cbc956cf950ca8db0b8950996f02612996c12493ae45864193f7f9ff19638a1099fc391a1f849fcdb2dc355f7a33085f1136be8d74b6ff971523d83ea6
 WHIRLPOOL 
3600990597a193f06d1587999087c710950b24e9795fb165e1ef6c126d1441424343f26e8eba6abec070bb5443d1d33a84cfea694c8e527360a5a57a469bb51e
-DIST artifactory-4.14.0.zip 41394700 SHA256 
09d2f77e7cb6f1853cd5b8245312b979d2a0670656993df2672d27bf653554fa SHA512 
b922f2af5be087288be7e3a862158a8c68100a842d17a695235ffbdce5566d15be7e3e3c166732faf9a414e54a69d7837b0cbdb983c9e7f7a600e2ce96567268
 WHIRLPOOL 
11f6d1bd55837722f7f4ef408e9041e507dbd5f92255a32c0353cb79ecb2041c4b1ba3e846398b0c16b3b1c40cfbcdaafa8e419f2856c5dc615439c67e1bd03c
-DIST artifactory-4.14.1.zip 41393806 SHA256 
48deba9f045a0b3b796646043c2c01a26a673eb5706b3f9477cfc9292ddfef7e SHA512 
0d096e004ac91728fb7c80c12fbc4e6633de7b481c5b5043c95dab16b9b63df25449532dc8d94a582aa9eb5991d58bf2dd082630f3b3b166fde5ef0e5d2fff1d
 WHIRLPOOL 
d70c9516c93390798758018cbf3a0d17c89ba1d7e9fde4c5c3766f883cd95241ab75f64798154370d1f0832d142e734d1e5973dbf284c8651c979fc6cc0a4d9d
-DIST artifactory-4.14.2.zip 41412238 SHA256 
74ffcb027fc6d6a93acb8f454fe09a90907ed6f8ff7880c282d0ce7f2bef8865 SHA512 
c0a4dbab5f9badb451f6ef06878f0eb5f18aa54db8595ae92adc3ced1e1d43f2220b844fd9b782272685f9ddc59e661c27c4c4e0f4e2fa844e78de3c92a95542
 WHIRLPOOL 
c000b3798726ddfda99469ad317dc9c58d9d74ea6611bc86899a40835580f1280dbcf888b3f3e4f330bee8862693a24124a04b81bc3424cab7fd4aced57178ee
 DIST artifactory-4.16.0.zip 41455447 SHA256 
f5711536cdf0a597799e01c570bbd38e6f5f3ffb6935cde21d38119be6592f16 SHA512 
e861b66ed7586ba881267312462584fd9037e2b72021e930a52489ae718ca2449c7997278cb26cb3dead774f16d74cf285c8ce2fca0c085e7edb444f71deaa14
 WHIRLPOOL 
01a60743fe85909d06f69ef4bda94a2cfb37e847ee481ee025075c0b586df11118566f7f99352a7808147eec51fc1bacb649853baa97a90253ab89d3b92279a5
-DIST artifactory-4.7.6.zip 40332783 SHA256 
8f2ee405e7b13ea2121a0e1c97ef3097ae54e9753d7288cc4ee95d3831cb01dd SHA512 
06d102b8a17172a8f6a67e9f166278b59569ba8439c9eea02bc1a7401182f72bc00da8ea3484a30b1c96ab167d331868169edd3051f6e027d772a9c5ede50852
 WHIRLPOOL 
296dc74c9698058b2fc020ce0561929a7a75dc47ad48cce37be1d4e86e0c4bbddfb7ab108f58ee1175bb0fff113a4a216a11c6ddf01380d3fd8c826607712990
-DIST artifactory-4.7.7.zip 40327123 SHA256 
953a208daa35767ca915a9bab20310493c9abd78f238f787387c89077d377716 SHA512 
2ebda9b45a819c9f060a7d789878f09ffb5e8791f9913ba5f86498ad69a01731fca9efde7c0ed9e206ea35a98d733052146c407208f28a3efc0b25423b11a894
 WHIRLPOOL 
57e60d9426849f140fdd67bc775c9d9e08c0c78926347dc5bd64cf0c5d0fd1ab759539756e98183e093e6e9b27301d5bb6192ca5c023c71664a49bded23b8a0e
-DIST artifactory-4.8.0.zip 41084705 SHA256 
2de13962ad1e6f4f1537e1fd86b6e70da6afae67a2449bf0cb369d3a84267647 SHA512 
a21310a7699c63a2fe3f305f42fef0aab6a0b9d43b2b8ba89d2360e5f8364d233f6f64616271d6cd4e79c1cecd18b1a7197fbb034a5eabd77d97b257e09b2910
 WHIRLPOOL 
e6a62c25f2927ea069fa512c40f8b7ea4cecb8625acdd8149c1f2db298b7375e362ee616562b37e9a00d5ed5451cb5861bf906d4d5c796eec9735e62b2a46e88
-DIST artifactory-4.8.1.zip 40949993 SHA256 
12218335d6f45d1ffca0bce2cbe636cf4d8c9fe71747dc9ce04a7be78acd9529 SHA512 
0873003d307187adcaff77ab52daebdcffbc96748f2203ead169148fdb3860fd90d28c68bacf58fc928c5608303d5d4fdb839ed7d5c6f5a4ddca573e91946c85
 WHIRLPOOL 
a6c38a5d38ea3034c578b47b7021146cb960e25833155606d9cd2d301c644b400af81a28c4779caec82ae0296f04185225d3bb6cee06dffdb224937430df390a
-DIST artifactory-4.8.2.zip 40938623 SHA256 
6821196157e9cba70f99c0fe960971333455327cc54139f310edc30e88dd2392 SHA512 
9bf40b945c943a08a92f5e1fac3a75ab923fcc57e04a7e845e8fb75a0825199b2ce6f3d90c58669777388c400c953873123e8de76a0244786d4106f6b426a6bc
 WHIRLPOOL 
571654b43cc36f02bb731e46ae89b37146c2e785419f620226363a7f38b11cb8e54667d2faff1c922ee2e8437c18d05c37c7afeb395cf59328a31ad8ff1b52e8
-DIST artifactory-4.9.0.zip 41020300 SHA256 
c97c2293c676c9ca5e3c0c64b2a02e2565427f3fe2cf5aa3e0518f6b541a23e5 SHA512 
266891f4d1b580f4f0764dee75f452cc73d76287565e8d89a84b912bb58d816e08369b56a1cf6858d23aefbf95d347386b9a6f4dc451d8ed80635b972680911d
 WHIRLPOOL 
4a485c80d4f5e68ac19616569e14fb4623329aebf7d1724cccce4d2820dd00f26d97a2a1afc69f8df39af3a39db87e6098c9739f9c51e5b5b6f19e18835729f3
-DIST artifactory-4.9.1.zip 41017240 SHA256 
d69635a02c2cdf7d19b593dd5378baf77552769c06ceb0900cb2177f61594d0d SHA512 
4001128fb7d4cb38417c96745a0795434498afe2e44d316748982fee4afde5076f8c05062f1712f169f260b2df3bd7322e845846d32acef0a65aa8385e44b1eb
 WHIRLPOOL 
1d781e82505a26b42e27d90f540d52d5eff22d25feff9ef8118ca32172b793509d0b2452506ac360833ce88a05e6ee9bb95d22f1c7c186fda624004b1a4ffe24

diff --git a/dev-util/artifactory-bin/artifactory-bin-4.10.0.ebuild 
b/dev-util/artifactory-bin/artifactory-bin-4.10.0.ebuild
deleted file mode 100644
index cc4ae8f9786..00000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.10.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - 
https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of 
artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php";
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip
 -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-               app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-       enewgroup artifactory
-       enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-src_prepare() {
-       default
-
-       if use ssl ; then
-               cp "${FILESDIR}/artifactory.xml" 
tomcat/conf/Catalina/localhost/artifactory.xml || die
-               cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-       fi
-
-       # Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-       sed -i -e 
"s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;"
 \
-               etc/artifactory.system.properties || die
-
-       # See FIXME in src_install(), this can probably go away,
-       # but catalina.sh may need to be fixed for that:
-       sed -i -e 
"s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-               misc/service/setenv.sh || die
-}
-
-src_install() {
-       local ARTIFACTORY_HOME="/opt/artifactory"
-       local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-       insinto ${ARTIFACTORY_HOME}
-       doins -r etc logs misc tomcat webapps
-
-       dodir /etc/opt/jfrog
-       dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-       dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-       exeinto ${ARTIFACTORY_HOME}/bin
-       doexe bin/*
-
-       # FIXME: this is called by catalina.sh (it echoes the variables before 
starting
-       # artifactory, as well as makes sure log dir, etc. exists). Those 
directories
-       # could probably be moved to the ebuild and the script removed from 
catalina.sh
-       # without consequence (and quieter starts). Would need to check if 
CATALINA_*
-       # variables are actually used anywhere (from reading code don't appear 
to be
-       # actually needed)
-       exeinto ${TOMCAT_HOME}/bin
-       doexe misc/service/setenv.sh
-       doexe tomcat/bin/*
-
-       keepdir ${ARTIFACTORY_HOME}/backup
-       keepdir ${ARTIFACTORY_HOME}/data
-       keepdir ${ARTIFACTORY_HOME}/run
-       keepdir ${ARTIFACTORY_HOME}/work
-       keepdir ${TOMCAT_HOME}/logs/catalina
-       keepdir ${TOMCAT_HOME}/temp
-       keepdir ${TOMCAT_HOME}/work
-       keepdir /var/opt/jfrog/artifactory/run
-
-       newconfd "${FILESDIR}/confd" ${MY_PN}
-       newinitd "${FILESDIR}/initd" ${MY_PN}
-
-       fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-       fperms -R u+w ${TOMCAT_HOME}/work
-}

diff --git a/dev-util/artifactory-bin/artifactory-bin-4.11.0.ebuild 
b/dev-util/artifactory-bin/artifactory-bin-4.11.0.ebuild
deleted file mode 100644
index cc4ae8f9786..00000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.11.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - 
https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of 
artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php";
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip
 -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-               app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-       enewgroup artifactory
-       enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-src_prepare() {
-       default
-
-       if use ssl ; then
-               cp "${FILESDIR}/artifactory.xml" 
tomcat/conf/Catalina/localhost/artifactory.xml || die
-               cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-       fi
-
-       # Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-       sed -i -e 
"s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;"
 \
-               etc/artifactory.system.properties || die
-
-       # See FIXME in src_install(), this can probably go away,
-       # but catalina.sh may need to be fixed for that:
-       sed -i -e 
"s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-               misc/service/setenv.sh || die
-}
-
-src_install() {
-       local ARTIFACTORY_HOME="/opt/artifactory"
-       local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-       insinto ${ARTIFACTORY_HOME}
-       doins -r etc logs misc tomcat webapps
-
-       dodir /etc/opt/jfrog
-       dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-       dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-       exeinto ${ARTIFACTORY_HOME}/bin
-       doexe bin/*
-
-       # FIXME: this is called by catalina.sh (it echoes the variables before 
starting
-       # artifactory, as well as makes sure log dir, etc. exists). Those 
directories
-       # could probably be moved to the ebuild and the script removed from 
catalina.sh
-       # without consequence (and quieter starts). Would need to check if 
CATALINA_*
-       # variables are actually used anywhere (from reading code don't appear 
to be
-       # actually needed)
-       exeinto ${TOMCAT_HOME}/bin
-       doexe misc/service/setenv.sh
-       doexe tomcat/bin/*
-
-       keepdir ${ARTIFACTORY_HOME}/backup
-       keepdir ${ARTIFACTORY_HOME}/data
-       keepdir ${ARTIFACTORY_HOME}/run
-       keepdir ${ARTIFACTORY_HOME}/work
-       keepdir ${TOMCAT_HOME}/logs/catalina
-       keepdir ${TOMCAT_HOME}/temp
-       keepdir ${TOMCAT_HOME}/work
-       keepdir /var/opt/jfrog/artifactory/run
-
-       newconfd "${FILESDIR}/confd" ${MY_PN}
-       newinitd "${FILESDIR}/initd" ${MY_PN}
-
-       fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-       fperms -R u+w ${TOMCAT_HOME}/work
-}

diff --git a/dev-util/artifactory-bin/artifactory-bin-4.11.1.ebuild 
b/dev-util/artifactory-bin/artifactory-bin-4.11.1.ebuild
deleted file mode 100644
index cc4ae8f9786..00000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.11.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - 
https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of 
artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php";
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip
 -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-               app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-       enewgroup artifactory
-       enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-src_prepare() {
-       default
-
-       if use ssl ; then
-               cp "${FILESDIR}/artifactory.xml" 
tomcat/conf/Catalina/localhost/artifactory.xml || die
-               cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-       fi
-
-       # Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-       sed -i -e 
"s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;"
 \
-               etc/artifactory.system.properties || die
-
-       # See FIXME in src_install(), this can probably go away,
-       # but catalina.sh may need to be fixed for that:
-       sed -i -e 
"s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-               misc/service/setenv.sh || die
-}
-
-src_install() {
-       local ARTIFACTORY_HOME="/opt/artifactory"
-       local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-       insinto ${ARTIFACTORY_HOME}
-       doins -r etc logs misc tomcat webapps
-
-       dodir /etc/opt/jfrog
-       dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-       dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-       exeinto ${ARTIFACTORY_HOME}/bin
-       doexe bin/*
-
-       # FIXME: this is called by catalina.sh (it echoes the variables before 
starting
-       # artifactory, as well as makes sure log dir, etc. exists). Those 
directories
-       # could probably be moved to the ebuild and the script removed from 
catalina.sh
-       # without consequence (and quieter starts). Would need to check if 
CATALINA_*
-       # variables are actually used anywhere (from reading code don't appear 
to be
-       # actually needed)
-       exeinto ${TOMCAT_HOME}/bin
-       doexe misc/service/setenv.sh
-       doexe tomcat/bin/*
-
-       keepdir ${ARTIFACTORY_HOME}/backup
-       keepdir ${ARTIFACTORY_HOME}/data
-       keepdir ${ARTIFACTORY_HOME}/run
-       keepdir ${ARTIFACTORY_HOME}/work
-       keepdir ${TOMCAT_HOME}/logs/catalina
-       keepdir ${TOMCAT_HOME}/temp
-       keepdir ${TOMCAT_HOME}/work
-       keepdir /var/opt/jfrog/artifactory/run
-
-       newconfd "${FILESDIR}/confd" ${MY_PN}
-       newinitd "${FILESDIR}/initd" ${MY_PN}
-
-       fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-       fperms -R u+w ${TOMCAT_HOME}/work
-}

diff --git a/dev-util/artifactory-bin/artifactory-bin-4.11.2.ebuild 
b/dev-util/artifactory-bin/artifactory-bin-4.11.2.ebuild
deleted file mode 100644
index cc4ae8f9786..00000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.11.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - 
https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of 
artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php";
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip
 -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-               app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-       enewgroup artifactory
-       enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-src_prepare() {
-       default
-
-       if use ssl ; then
-               cp "${FILESDIR}/artifactory.xml" 
tomcat/conf/Catalina/localhost/artifactory.xml || die
-               cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-       fi
-
-       # Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-       sed -i -e 
"s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;"
 \
-               etc/artifactory.system.properties || die
-
-       # See FIXME in src_install(), this can probably go away,
-       # but catalina.sh may need to be fixed for that:
-       sed -i -e 
"s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-               misc/service/setenv.sh || die
-}
-
-src_install() {
-       local ARTIFACTORY_HOME="/opt/artifactory"
-       local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-       insinto ${ARTIFACTORY_HOME}
-       doins -r etc logs misc tomcat webapps
-
-       dodir /etc/opt/jfrog
-       dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-       dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-       exeinto ${ARTIFACTORY_HOME}/bin
-       doexe bin/*
-
-       # FIXME: this is called by catalina.sh (it echoes the variables before 
starting
-       # artifactory, as well as makes sure log dir, etc. exists). Those 
directories
-       # could probably be moved to the ebuild and the script removed from 
catalina.sh
-       # without consequence (and quieter starts). Would need to check if 
CATALINA_*
-       # variables are actually used anywhere (from reading code don't appear 
to be
-       # actually needed)
-       exeinto ${TOMCAT_HOME}/bin
-       doexe misc/service/setenv.sh
-       doexe tomcat/bin/*
-
-       keepdir ${ARTIFACTORY_HOME}/backup
-       keepdir ${ARTIFACTORY_HOME}/data
-       keepdir ${ARTIFACTORY_HOME}/run
-       keepdir ${ARTIFACTORY_HOME}/work
-       keepdir ${TOMCAT_HOME}/logs/catalina
-       keepdir ${TOMCAT_HOME}/temp
-       keepdir ${TOMCAT_HOME}/work
-       keepdir /var/opt/jfrog/artifactory/run
-
-       newconfd "${FILESDIR}/confd" ${MY_PN}
-       newinitd "${FILESDIR}/initd" ${MY_PN}
-
-       fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-       fperms -R u+w ${TOMCAT_HOME}/work
-}

diff --git a/dev-util/artifactory-bin/artifactory-bin-4.12.0.1.ebuild 
b/dev-util/artifactory-bin/artifactory-bin-4.12.0.1.ebuild
deleted file mode 100644
index cc4ae8f9786..00000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.12.0.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - 
https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of 
artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php";
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip
 -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-               app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-       enewgroup artifactory
-       enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-src_prepare() {
-       default
-
-       if use ssl ; then
-               cp "${FILESDIR}/artifactory.xml" 
tomcat/conf/Catalina/localhost/artifactory.xml || die
-               cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-       fi
-
-       # Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-       sed -i -e 
"s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;"
 \
-               etc/artifactory.system.properties || die
-
-       # See FIXME in src_install(), this can probably go away,
-       # but catalina.sh may need to be fixed for that:
-       sed -i -e 
"s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-               misc/service/setenv.sh || die
-}
-
-src_install() {
-       local ARTIFACTORY_HOME="/opt/artifactory"
-       local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-       insinto ${ARTIFACTORY_HOME}
-       doins -r etc logs misc tomcat webapps
-
-       dodir /etc/opt/jfrog
-       dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-       dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-       exeinto ${ARTIFACTORY_HOME}/bin
-       doexe bin/*
-
-       # FIXME: this is called by catalina.sh (it echoes the variables before 
starting
-       # artifactory, as well as makes sure log dir, etc. exists). Those 
directories
-       # could probably be moved to the ebuild and the script removed from 
catalina.sh
-       # without consequence (and quieter starts). Would need to check if 
CATALINA_*
-       # variables are actually used anywhere (from reading code don't appear 
to be
-       # actually needed)
-       exeinto ${TOMCAT_HOME}/bin
-       doexe misc/service/setenv.sh
-       doexe tomcat/bin/*
-
-       keepdir ${ARTIFACTORY_HOME}/backup
-       keepdir ${ARTIFACTORY_HOME}/data
-       keepdir ${ARTIFACTORY_HOME}/run
-       keepdir ${ARTIFACTORY_HOME}/work
-       keepdir ${TOMCAT_HOME}/logs/catalina
-       keepdir ${TOMCAT_HOME}/temp
-       keepdir ${TOMCAT_HOME}/work
-       keepdir /var/opt/jfrog/artifactory/run
-
-       newconfd "${FILESDIR}/confd" ${MY_PN}
-       newinitd "${FILESDIR}/initd" ${MY_PN}
-
-       fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-       fperms -R u+w ${TOMCAT_HOME}/work
-}

diff --git a/dev-util/artifactory-bin/artifactory-bin-4.12.1.ebuild 
b/dev-util/artifactory-bin/artifactory-bin-4.12.1.ebuild
deleted file mode 100644
index cc4ae8f9786..00000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.12.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - 
https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of 
artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php";
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip
 -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-               app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-       enewgroup artifactory
-       enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-src_prepare() {
-       default
-
-       if use ssl ; then
-               cp "${FILESDIR}/artifactory.xml" 
tomcat/conf/Catalina/localhost/artifactory.xml || die
-               cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-       fi
-
-       # Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-       sed -i -e 
"s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;"
 \
-               etc/artifactory.system.properties || die
-
-       # See FIXME in src_install(), this can probably go away,
-       # but catalina.sh may need to be fixed for that:
-       sed -i -e 
"s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-               misc/service/setenv.sh || die
-}
-
-src_install() {
-       local ARTIFACTORY_HOME="/opt/artifactory"
-       local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-       insinto ${ARTIFACTORY_HOME}
-       doins -r etc logs misc tomcat webapps
-
-       dodir /etc/opt/jfrog
-       dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-       dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-       exeinto ${ARTIFACTORY_HOME}/bin
-       doexe bin/*
-
-       # FIXME: this is called by catalina.sh (it echoes the variables before 
starting
-       # artifactory, as well as makes sure log dir, etc. exists). Those 
directories
-       # could probably be moved to the ebuild and the script removed from 
catalina.sh
-       # without consequence (and quieter starts). Would need to check if 
CATALINA_*
-       # variables are actually used anywhere (from reading code don't appear 
to be
-       # actually needed)
-       exeinto ${TOMCAT_HOME}/bin
-       doexe misc/service/setenv.sh
-       doexe tomcat/bin/*
-
-       keepdir ${ARTIFACTORY_HOME}/backup
-       keepdir ${ARTIFACTORY_HOME}/data
-       keepdir ${ARTIFACTORY_HOME}/run
-       keepdir ${ARTIFACTORY_HOME}/work
-       keepdir ${TOMCAT_HOME}/logs/catalina
-       keepdir ${TOMCAT_HOME}/temp
-       keepdir ${TOMCAT_HOME}/work
-       keepdir /var/opt/jfrog/artifactory/run
-
-       newconfd "${FILESDIR}/confd" ${MY_PN}
-       newinitd "${FILESDIR}/initd" ${MY_PN}
-
-       fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-       fperms -R u+w ${TOMCAT_HOME}/work
-}

diff --git a/dev-util/artifactory-bin/artifactory-bin-4.12.2.ebuild 
b/dev-util/artifactory-bin/artifactory-bin-4.12.2.ebuild
deleted file mode 100644
index cc4ae8f9786..00000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.12.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - 
https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of 
artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php";
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip
 -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-               app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-       enewgroup artifactory
-       enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-src_prepare() {
-       default
-
-       if use ssl ; then
-               cp "${FILESDIR}/artifactory.xml" 
tomcat/conf/Catalina/localhost/artifactory.xml || die
-               cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-       fi
-
-       # Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-       sed -i -e 
"s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;"
 \
-               etc/artifactory.system.properties || die
-
-       # See FIXME in src_install(), this can probably go away,
-       # but catalina.sh may need to be fixed for that:
-       sed -i -e 
"s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-               misc/service/setenv.sh || die
-}
-
-src_install() {
-       local ARTIFACTORY_HOME="/opt/artifactory"
-       local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-       insinto ${ARTIFACTORY_HOME}
-       doins -r etc logs misc tomcat webapps
-
-       dodir /etc/opt/jfrog
-       dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-       dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-       exeinto ${ARTIFACTORY_HOME}/bin
-       doexe bin/*
-
-       # FIXME: this is called by catalina.sh (it echoes the variables before 
starting
-       # artifactory, as well as makes sure log dir, etc. exists). Those 
directories
-       # could probably be moved to the ebuild and the script removed from 
catalina.sh
-       # without consequence (and quieter starts). Would need to check if 
CATALINA_*
-       # variables are actually used anywhere (from reading code don't appear 
to be
-       # actually needed)
-       exeinto ${TOMCAT_HOME}/bin
-       doexe misc/service/setenv.sh
-       doexe tomcat/bin/*
-
-       keepdir ${ARTIFACTORY_HOME}/backup
-       keepdir ${ARTIFACTORY_HOME}/data
-       keepdir ${ARTIFACTORY_HOME}/run
-       keepdir ${ARTIFACTORY_HOME}/work
-       keepdir ${TOMCAT_HOME}/logs/catalina
-       keepdir ${TOMCAT_HOME}/temp
-       keepdir ${TOMCAT_HOME}/work
-       keepdir /var/opt/jfrog/artifactory/run
-
-       newconfd "${FILESDIR}/confd" ${MY_PN}
-       newinitd "${FILESDIR}/initd" ${MY_PN}
-
-       fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-       fperms -R u+w ${TOMCAT_HOME}/work
-}

diff --git a/dev-util/artifactory-bin/artifactory-bin-4.13.0.ebuild 
b/dev-util/artifactory-bin/artifactory-bin-4.13.0.ebuild
deleted file mode 100644
index cc4ae8f9786..00000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.13.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - 
https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of 
artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php";
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip
 -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-               app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-       enewgroup artifactory
-       enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-src_prepare() {
-       default
-
-       if use ssl ; then
-               cp "${FILESDIR}/artifactory.xml" 
tomcat/conf/Catalina/localhost/artifactory.xml || die
-               cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-       fi
-
-       # Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-       sed -i -e 
"s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;"
 \
-               etc/artifactory.system.properties || die
-
-       # See FIXME in src_install(), this can probably go away,
-       # but catalina.sh may need to be fixed for that:
-       sed -i -e 
"s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-               misc/service/setenv.sh || die
-}
-
-src_install() {
-       local ARTIFACTORY_HOME="/opt/artifactory"
-       local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-       insinto ${ARTIFACTORY_HOME}
-       doins -r etc logs misc tomcat webapps
-
-       dodir /etc/opt/jfrog
-       dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-       dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-       exeinto ${ARTIFACTORY_HOME}/bin
-       doexe bin/*
-
-       # FIXME: this is called by catalina.sh (it echoes the variables before 
starting
-       # artifactory, as well as makes sure log dir, etc. exists). Those 
directories
-       # could probably be moved to the ebuild and the script removed from 
catalina.sh
-       # without consequence (and quieter starts). Would need to check if 
CATALINA_*
-       # variables are actually used anywhere (from reading code don't appear 
to be
-       # actually needed)
-       exeinto ${TOMCAT_HOME}/bin
-       doexe misc/service/setenv.sh
-       doexe tomcat/bin/*
-
-       keepdir ${ARTIFACTORY_HOME}/backup
-       keepdir ${ARTIFACTORY_HOME}/data
-       keepdir ${ARTIFACTORY_HOME}/run
-       keepdir ${ARTIFACTORY_HOME}/work
-       keepdir ${TOMCAT_HOME}/logs/catalina
-       keepdir ${TOMCAT_HOME}/temp
-       keepdir ${TOMCAT_HOME}/work
-       keepdir /var/opt/jfrog/artifactory/run
-
-       newconfd "${FILESDIR}/confd" ${MY_PN}
-       newinitd "${FILESDIR}/initd" ${MY_PN}
-
-       fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-       fperms -R u+w ${TOMCAT_HOME}/work
-}

diff --git a/dev-util/artifactory-bin/artifactory-bin-4.13.1.ebuild 
b/dev-util/artifactory-bin/artifactory-bin-4.13.1.ebuild
deleted file mode 100644
index 7af12654f3e..00000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.13.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - 
https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of 
artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php";
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip
 -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-               app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-       enewgroup artifactory
-       enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-src_prepare() {
-       default
-
-       if use ssl ; then
-               cp "${FILESDIR}/artifactory.xml" 
tomcat/conf/Catalina/localhost/artifactory.xml || die
-               cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-       fi
-
-       # Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-       sed -i -e 
"s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;"
 \
-               etc/artifactory.system.properties || die
-
-       # See FIXME in src_install(), this can probably go away,
-       # but catalina.sh may need to be fixed for that:
-       sed -i -e 
"s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-               misc/service/setenv.sh || die
-}
-
-src_install() {
-       local ARTIFACTORY_HOME="/opt/artifactory"
-       local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-       insinto ${ARTIFACTORY_HOME}
-       doins -r etc logs misc tomcat webapps
-
-       dodir /etc/opt/jfrog
-       dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-       dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-       exeinto ${ARTIFACTORY_HOME}/bin
-       doexe bin/*
-
-       # FIXME: this is called by catalina.sh (it echoes the variables before 
starting
-       # artifactory, as well as makes sure log dir, etc. exists). Those 
directories
-       # could probably be moved to the ebuild and the script removed from 
catalina.sh
-       # without consequence (and quieter starts). Would need to check if 
CATALINA_*
-       # variables are actually used anywhere (from reading code don't appear 
to be
-       # actually needed)
-       exeinto ${TOMCAT_HOME}/bin
-       doexe misc/service/setenv.sh
-       doexe tomcat/bin/*
-
-       keepdir ${ARTIFACTORY_HOME}/backup
-       keepdir ${ARTIFACTORY_HOME}/data
-       keepdir ${ARTIFACTORY_HOME}/run
-       keepdir ${ARTIFACTORY_HOME}/work
-       keepdir ${TOMCAT_HOME}/logs/catalina
-       keepdir ${TOMCAT_HOME}/temp
-       keepdir ${TOMCAT_HOME}/work
-       keepdir /var/opt/jfrog/artifactory/run
-
-       newconfd "${FILESDIR}/confd" ${MY_PN}
-       newinitd "${FILESDIR}/initd-r1" ${MY_PN}
-
-       fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-       fperms -R u+w ${TOMCAT_HOME}/work
-}

diff --git a/dev-util/artifactory-bin/artifactory-bin-4.13.2.ebuild 
b/dev-util/artifactory-bin/artifactory-bin-4.13.2.ebuild
deleted file mode 100644
index 7af12654f3e..00000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.13.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - 
https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of 
artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php";
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip
 -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-               app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-       enewgroup artifactory
-       enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-src_prepare() {
-       default
-
-       if use ssl ; then
-               cp "${FILESDIR}/artifactory.xml" 
tomcat/conf/Catalina/localhost/artifactory.xml || die
-               cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-       fi
-
-       # Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-       sed -i -e 
"s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;"
 \
-               etc/artifactory.system.properties || die
-
-       # See FIXME in src_install(), this can probably go away,
-       # but catalina.sh may need to be fixed for that:
-       sed -i -e 
"s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-               misc/service/setenv.sh || die
-}
-
-src_install() {
-       local ARTIFACTORY_HOME="/opt/artifactory"
-       local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-       insinto ${ARTIFACTORY_HOME}
-       doins -r etc logs misc tomcat webapps
-
-       dodir /etc/opt/jfrog
-       dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-       dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-       exeinto ${ARTIFACTORY_HOME}/bin
-       doexe bin/*
-
-       # FIXME: this is called by catalina.sh (it echoes the variables before 
starting
-       # artifactory, as well as makes sure log dir, etc. exists). Those 
directories
-       # could probably be moved to the ebuild and the script removed from 
catalina.sh
-       # without consequence (and quieter starts). Would need to check if 
CATALINA_*
-       # variables are actually used anywhere (from reading code don't appear 
to be
-       # actually needed)
-       exeinto ${TOMCAT_HOME}/bin
-       doexe misc/service/setenv.sh
-       doexe tomcat/bin/*
-
-       keepdir ${ARTIFACTORY_HOME}/backup
-       keepdir ${ARTIFACTORY_HOME}/data
-       keepdir ${ARTIFACTORY_HOME}/run
-       keepdir ${ARTIFACTORY_HOME}/work
-       keepdir ${TOMCAT_HOME}/logs/catalina
-       keepdir ${TOMCAT_HOME}/temp
-       keepdir ${TOMCAT_HOME}/work
-       keepdir /var/opt/jfrog/artifactory/run
-
-       newconfd "${FILESDIR}/confd" ${MY_PN}
-       newinitd "${FILESDIR}/initd-r1" ${MY_PN}
-
-       fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-       fperms -R u+w ${TOMCAT_HOME}/work
-}

diff --git a/dev-util/artifactory-bin/artifactory-bin-4.14.0-r1.ebuild 
b/dev-util/artifactory-bin/artifactory-bin-4.14.0-r1.ebuild
deleted file mode 100644
index 3afb11daa27..00000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.14.0-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - 
https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of 
artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php";
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip
 -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-               app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-       enewgroup artifactory
-       enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-src_prepare() {
-       default
-
-       if use ssl ; then
-               cp "${FILESDIR}/artifactory.xml" 
tomcat/conf/Catalina/localhost/artifactory.xml || die
-               cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-       fi
-
-       # Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-       sed -i -e 
"s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;"
 \
-               etc/artifactory.system.properties || die
-
-       # See FIXME in src_install(), this can probably go away,
-       # but catalina.sh may need to be fixed for that:
-       sed -i -e 
"s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-               misc/service/setenv.sh || die
-}
-
-src_install() {
-       local ARTIFACTORY_HOME="/opt/artifactory"
-       local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-       insinto ${ARTIFACTORY_HOME}
-       doins -r etc logs misc tomcat webapps
-
-       dodir /etc/opt/jfrog
-       dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-       dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-       exeinto ${ARTIFACTORY_HOME}/bin
-       doexe bin/*
-
-       # FIXME: this is called by catalina.sh (it echoes the variables before 
starting
-       # artifactory, as well as makes sure log dir, etc. exists). Those 
directories
-       # could probably be moved to the ebuild and the script removed from 
catalina.sh
-       # without consequence (and quieter starts). Would need to check if 
CATALINA_*
-       # variables are actually used anywhere (from reading code don't appear 
to be
-       # actually needed)
-       exeinto ${TOMCAT_HOME}/bin
-       doexe misc/service/setenv.sh
-       doexe tomcat/bin/*
-
-       keepdir ${ARTIFACTORY_HOME}/backup
-       keepdir ${ARTIFACTORY_HOME}/data
-       keepdir ${ARTIFACTORY_HOME}/run
-       keepdir ${ARTIFACTORY_HOME}/work
-       keepdir ${TOMCAT_HOME}/logs/catalina
-       keepdir ${TOMCAT_HOME}/temp
-       keepdir ${TOMCAT_HOME}/work
-       keepdir /var/opt/jfrog/artifactory/run
-
-       newconfd "${FILESDIR}/confd" ${MY_PN}
-       newinitd "${FILESDIR}/initd-r2" ${MY_PN}
-
-       fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-       fperms -R u+w ${TOMCAT_HOME}/work
-}

diff --git a/dev-util/artifactory-bin/artifactory-bin-4.14.0.ebuild 
b/dev-util/artifactory-bin/artifactory-bin-4.14.0.ebuild
deleted file mode 100644
index 7af12654f3e..00000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.14.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - 
https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of 
artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php";
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip
 -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-               app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-       enewgroup artifactory
-       enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-src_prepare() {
-       default
-
-       if use ssl ; then
-               cp "${FILESDIR}/artifactory.xml" 
tomcat/conf/Catalina/localhost/artifactory.xml || die
-               cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-       fi
-
-       # Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-       sed -i -e 
"s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;"
 \
-               etc/artifactory.system.properties || die
-
-       # See FIXME in src_install(), this can probably go away,
-       # but catalina.sh may need to be fixed for that:
-       sed -i -e 
"s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-               misc/service/setenv.sh || die
-}
-
-src_install() {
-       local ARTIFACTORY_HOME="/opt/artifactory"
-       local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-       insinto ${ARTIFACTORY_HOME}
-       doins -r etc logs misc tomcat webapps
-
-       dodir /etc/opt/jfrog
-       dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-       dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-       exeinto ${ARTIFACTORY_HOME}/bin
-       doexe bin/*
-
-       # FIXME: this is called by catalina.sh (it echoes the variables before 
starting
-       # artifactory, as well as makes sure log dir, etc. exists). Those 
directories
-       # could probably be moved to the ebuild and the script removed from 
catalina.sh
-       # without consequence (and quieter starts). Would need to check if 
CATALINA_*
-       # variables are actually used anywhere (from reading code don't appear 
to be
-       # actually needed)
-       exeinto ${TOMCAT_HOME}/bin
-       doexe misc/service/setenv.sh
-       doexe tomcat/bin/*
-
-       keepdir ${ARTIFACTORY_HOME}/backup
-       keepdir ${ARTIFACTORY_HOME}/data
-       keepdir ${ARTIFACTORY_HOME}/run
-       keepdir ${ARTIFACTORY_HOME}/work
-       keepdir ${TOMCAT_HOME}/logs/catalina
-       keepdir ${TOMCAT_HOME}/temp
-       keepdir ${TOMCAT_HOME}/work
-       keepdir /var/opt/jfrog/artifactory/run
-
-       newconfd "${FILESDIR}/confd" ${MY_PN}
-       newinitd "${FILESDIR}/initd-r1" ${MY_PN}
-
-       fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-       fperms -R u+w ${TOMCAT_HOME}/work
-}

diff --git a/dev-util/artifactory-bin/artifactory-bin-4.14.1.ebuild 
b/dev-util/artifactory-bin/artifactory-bin-4.14.1.ebuild
deleted file mode 100644
index 3afb11daa27..00000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.14.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - 
https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of 
artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php";
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip
 -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-               app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-       enewgroup artifactory
-       enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-src_prepare() {
-       default
-
-       if use ssl ; then
-               cp "${FILESDIR}/artifactory.xml" 
tomcat/conf/Catalina/localhost/artifactory.xml || die
-               cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-       fi
-
-       # Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-       sed -i -e 
"s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;"
 \
-               etc/artifactory.system.properties || die
-
-       # See FIXME in src_install(), this can probably go away,
-       # but catalina.sh may need to be fixed for that:
-       sed -i -e 
"s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-               misc/service/setenv.sh || die
-}
-
-src_install() {
-       local ARTIFACTORY_HOME="/opt/artifactory"
-       local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-       insinto ${ARTIFACTORY_HOME}
-       doins -r etc logs misc tomcat webapps
-
-       dodir /etc/opt/jfrog
-       dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-       dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-       exeinto ${ARTIFACTORY_HOME}/bin
-       doexe bin/*
-
-       # FIXME: this is called by catalina.sh (it echoes the variables before 
starting
-       # artifactory, as well as makes sure log dir, etc. exists). Those 
directories
-       # could probably be moved to the ebuild and the script removed from 
catalina.sh
-       # without consequence (and quieter starts). Would need to check if 
CATALINA_*
-       # variables are actually used anywhere (from reading code don't appear 
to be
-       # actually needed)
-       exeinto ${TOMCAT_HOME}/bin
-       doexe misc/service/setenv.sh
-       doexe tomcat/bin/*
-
-       keepdir ${ARTIFACTORY_HOME}/backup
-       keepdir ${ARTIFACTORY_HOME}/data
-       keepdir ${ARTIFACTORY_HOME}/run
-       keepdir ${ARTIFACTORY_HOME}/work
-       keepdir ${TOMCAT_HOME}/logs/catalina
-       keepdir ${TOMCAT_HOME}/temp
-       keepdir ${TOMCAT_HOME}/work
-       keepdir /var/opt/jfrog/artifactory/run
-
-       newconfd "${FILESDIR}/confd" ${MY_PN}
-       newinitd "${FILESDIR}/initd-r2" ${MY_PN}
-
-       fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-       fperms -R u+w ${TOMCAT_HOME}/work
-}

diff --git a/dev-util/artifactory-bin/artifactory-bin-4.14.2.ebuild 
b/dev-util/artifactory-bin/artifactory-bin-4.14.2.ebuild
deleted file mode 100644
index 3afb11daa27..00000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.14.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - 
https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of 
artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php";
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip
 -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-               app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-       enewgroup artifactory
-       enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-src_prepare() {
-       default
-
-       if use ssl ; then
-               cp "${FILESDIR}/artifactory.xml" 
tomcat/conf/Catalina/localhost/artifactory.xml || die
-               cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-       fi
-
-       # Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-       sed -i -e 
"s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;"
 \
-               etc/artifactory.system.properties || die
-
-       # See FIXME in src_install(), this can probably go away,
-       # but catalina.sh may need to be fixed for that:
-       sed -i -e 
"s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-               misc/service/setenv.sh || die
-}
-
-src_install() {
-       local ARTIFACTORY_HOME="/opt/artifactory"
-       local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-       insinto ${ARTIFACTORY_HOME}
-       doins -r etc logs misc tomcat webapps
-
-       dodir /etc/opt/jfrog
-       dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-       dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-       exeinto ${ARTIFACTORY_HOME}/bin
-       doexe bin/*
-
-       # FIXME: this is called by catalina.sh (it echoes the variables before 
starting
-       # artifactory, as well as makes sure log dir, etc. exists). Those 
directories
-       # could probably be moved to the ebuild and the script removed from 
catalina.sh
-       # without consequence (and quieter starts). Would need to check if 
CATALINA_*
-       # variables are actually used anywhere (from reading code don't appear 
to be
-       # actually needed)
-       exeinto ${TOMCAT_HOME}/bin
-       doexe misc/service/setenv.sh
-       doexe tomcat/bin/*
-
-       keepdir ${ARTIFACTORY_HOME}/backup
-       keepdir ${ARTIFACTORY_HOME}/data
-       keepdir ${ARTIFACTORY_HOME}/run
-       keepdir ${ARTIFACTORY_HOME}/work
-       keepdir ${TOMCAT_HOME}/logs/catalina
-       keepdir ${TOMCAT_HOME}/temp
-       keepdir ${TOMCAT_HOME}/work
-       keepdir /var/opt/jfrog/artifactory/run
-
-       newconfd "${FILESDIR}/confd" ${MY_PN}
-       newinitd "${FILESDIR}/initd-r2" ${MY_PN}
-
-       fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-       fperms -R u+w ${TOMCAT_HOME}/work
-}

diff --git a/dev-util/artifactory-bin/artifactory-bin-4.16.0.ebuild 
b/dev-util/artifactory-bin/artifactory-bin-4.16.0.ebuild
deleted file mode 100644
index 25a3a19fc30..00000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.16.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - 
https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of 
artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php";
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip
 -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-               app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-       enewgroup artifactory
-       enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-src_prepare() {
-       default
-
-       if use ssl ; then
-               cp "${FILESDIR}/artifactory.xml" 
tomcat/conf/Catalina/localhost/artifactory.xml || die
-               cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-       fi
-
-       # Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-       sed -i -e 
"s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;"
 \
-               etc/artifactory.system.properties || die
-
-       # See FIXME in src_install(), this can probably go away,
-       # but catalina.sh may need to be fixed for that:
-       sed -i -e 
"s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-               misc/service/setenv.sh || die
-}
-
-src_install() {
-       local ARTIFACTORY_HOME="/opt/artifactory"
-       local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-       insinto ${ARTIFACTORY_HOME}
-       doins -r etc logs misc tomcat webapps
-
-       dodir /etc/opt/jfrog
-       dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-       dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-       exeinto ${ARTIFACTORY_HOME}/bin
-       doexe bin/*
-
-       # FIXME: this is called by catalina.sh (it echoes the variables before 
starting
-       # artifactory, as well as makes sure log dir, etc. exists). Those 
directories
-       # could probably be moved to the ebuild and the script removed from 
catalina.sh
-       # without consequence (and quieter starts). Would need to check if 
CATALINA_*
-       # variables are actually used anywhere (from reading code don't appear 
to be
-       # actually needed)
-       exeinto ${TOMCAT_HOME}/bin
-       doexe misc/service/setenv.sh
-       doexe tomcat/bin/*
-
-       keepdir ${ARTIFACTORY_HOME}/backup
-       keepdir ${ARTIFACTORY_HOME}/data
-       keepdir ${ARTIFACTORY_HOME}/run
-       keepdir ${ARTIFACTORY_HOME}/work
-       keepdir ${TOMCAT_HOME}/logs/catalina
-       keepdir ${TOMCAT_HOME}/temp
-       keepdir ${TOMCAT_HOME}/work
-       keepdir /var/opt/jfrog/artifactory/run
-
-       newconfd "${FILESDIR}/confd" ${MY_PN}
-       newinitd "${FILESDIR}/initd-r2" ${MY_PN}
-
-       fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-       fperms -R u+w ${TOMCAT_HOME}/work
-}

diff --git a/dev-util/artifactory-bin/artifactory-bin-4.7.6.ebuild 
b/dev-util/artifactory-bin/artifactory-bin-4.7.6.ebuild
deleted file mode 100644
index 083c74b35c1..00000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.7.6.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This is currently blocked by two major bugs upstream:
-# A lack of documented build instructions - 
https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php";
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip
 -> ${MY_P}.zip"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-               app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-       enewgroup artifactory
-       enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-src_prepare() {
-       default
-
-       if use ssl ; then
-               cp "${FILESDIR}/artifactory.xml" 
tomcat/conf/Catalina/localhost/artifactory.xml || die
-               cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-       fi
-
-       # Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-       sed -i -e 
"s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;"
 \
-               etc/artifactory.system.properties || die
-
-       # See FIXME in src_install(), this can probably go away,
-       # but catalina.sh may need to be fixed for that:
-       sed -i -e 
"s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-               misc/service/setenv.sh || die
-}
-
-src_install() {
-       local ARTIFACTORY_HOME="/opt/artifactory"
-       local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-       insinto ${ARTIFACTORY_HOME}
-       doins -r etc logs misc tomcat webapps
-
-       dodir /etc/opt/jfrog
-       dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-       dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-       exeinto ${ARTIFACTORY_HOME}/bin
-       doexe bin/*
-
-       # FIXME: this is called by catalina.sh (it echoes the variables before 
starting
-       # artifactory, as well as makes sure log dir, etc. exists). Those 
directories
-       # could probably be moved to the ebuild and the script removed from 
catalina.sh
-       # without consequence (and quieter starts). Would need to check if 
CATALINA_*
-       # variables are actually used anywhere (from reading code don't appear 
to be
-       # actually needed)
-       exeinto ${TOMCAT_HOME}/bin
-       doexe misc/service/setenv.sh
-       doexe tomcat/bin/*
-
-       keepdir ${ARTIFACTORY_HOME}/backup
-       keepdir ${ARTIFACTORY_HOME}/data
-       keepdir ${ARTIFACTORY_HOME}/run
-       keepdir ${ARTIFACTORY_HOME}/work
-       keepdir ${TOMCAT_HOME}/logs/catalina
-       keepdir ${TOMCAT_HOME}/temp
-       keepdir ${TOMCAT_HOME}/work
-       keepdir /var/opt/jfrog/artifactory/run
-
-       newconfd "${FILESDIR}/confd" ${MY_PN}
-       newinitd "${FILESDIR}/initd" ${MY_PN}
-
-       fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-       fperms -R u+w ${TOMCAT_HOME}/work
-}

diff --git a/dev-util/artifactory-bin/artifactory-bin-4.7.7.ebuild 
b/dev-util/artifactory-bin/artifactory-bin-4.7.7.ebuild
deleted file mode 100644
index 083c74b35c1..00000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.7.7.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This is currently blocked by two major bugs upstream:
-# A lack of documented build instructions - 
https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php";
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip
 -> ${MY_P}.zip"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-               app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-       enewgroup artifactory
-       enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-src_prepare() {
-       default
-
-       if use ssl ; then
-               cp "${FILESDIR}/artifactory.xml" 
tomcat/conf/Catalina/localhost/artifactory.xml || die
-               cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-       fi
-
-       # Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-       sed -i -e 
"s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;"
 \
-               etc/artifactory.system.properties || die
-
-       # See FIXME in src_install(), this can probably go away,
-       # but catalina.sh may need to be fixed for that:
-       sed -i -e 
"s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-               misc/service/setenv.sh || die
-}
-
-src_install() {
-       local ARTIFACTORY_HOME="/opt/artifactory"
-       local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-       insinto ${ARTIFACTORY_HOME}
-       doins -r etc logs misc tomcat webapps
-
-       dodir /etc/opt/jfrog
-       dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-       dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-       exeinto ${ARTIFACTORY_HOME}/bin
-       doexe bin/*
-
-       # FIXME: this is called by catalina.sh (it echoes the variables before 
starting
-       # artifactory, as well as makes sure log dir, etc. exists). Those 
directories
-       # could probably be moved to the ebuild and the script removed from 
catalina.sh
-       # without consequence (and quieter starts). Would need to check if 
CATALINA_*
-       # variables are actually used anywhere (from reading code don't appear 
to be
-       # actually needed)
-       exeinto ${TOMCAT_HOME}/bin
-       doexe misc/service/setenv.sh
-       doexe tomcat/bin/*
-
-       keepdir ${ARTIFACTORY_HOME}/backup
-       keepdir ${ARTIFACTORY_HOME}/data
-       keepdir ${ARTIFACTORY_HOME}/run
-       keepdir ${ARTIFACTORY_HOME}/work
-       keepdir ${TOMCAT_HOME}/logs/catalina
-       keepdir ${TOMCAT_HOME}/temp
-       keepdir ${TOMCAT_HOME}/work
-       keepdir /var/opt/jfrog/artifactory/run
-
-       newconfd "${FILESDIR}/confd" ${MY_PN}
-       newinitd "${FILESDIR}/initd" ${MY_PN}
-
-       fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-       fperms -R u+w ${TOMCAT_HOME}/work
-}

diff --git a/dev-util/artifactory-bin/artifactory-bin-4.8.0.ebuild 
b/dev-util/artifactory-bin/artifactory-bin-4.8.0.ebuild
deleted file mode 100644
index 1d85067c585..00000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.8.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - 
https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of 
artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php";
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip
 -> ${MY_P}.zip"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-               app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-       enewgroup artifactory
-       enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-src_prepare() {
-       default
-
-       if use ssl ; then
-               cp "${FILESDIR}/artifactory.xml" 
tomcat/conf/Catalina/localhost/artifactory.xml || die
-               cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-       fi
-
-       # Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-       sed -i -e 
"s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;"
 \
-               etc/artifactory.system.properties || die
-
-       # See FIXME in src_install(), this can probably go away,
-       # but catalina.sh may need to be fixed for that:
-       sed -i -e 
"s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-               misc/service/setenv.sh || die
-}
-
-src_install() {
-       local ARTIFACTORY_HOME="/opt/artifactory"
-       local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-       insinto ${ARTIFACTORY_HOME}
-       doins -r etc logs misc tomcat webapps
-
-       dodir /etc/opt/jfrog
-       dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-       dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-       exeinto ${ARTIFACTORY_HOME}/bin
-       doexe bin/*
-
-       # FIXME: this is called by catalina.sh (it echoes the variables before 
starting
-       # artifactory, as well as makes sure log dir, etc. exists). Those 
directories
-       # could probably be moved to the ebuild and the script removed from 
catalina.sh
-       # without consequence (and quieter starts). Would need to check if 
CATALINA_*
-       # variables are actually used anywhere (from reading code don't appear 
to be
-       # actually needed)
-       exeinto ${TOMCAT_HOME}/bin
-       doexe misc/service/setenv.sh
-       doexe tomcat/bin/*
-
-       keepdir ${ARTIFACTORY_HOME}/backup
-       keepdir ${ARTIFACTORY_HOME}/data
-       keepdir ${ARTIFACTORY_HOME}/run
-       keepdir ${ARTIFACTORY_HOME}/work
-       keepdir ${TOMCAT_HOME}/logs/catalina
-       keepdir ${TOMCAT_HOME}/temp
-       keepdir ${TOMCAT_HOME}/work
-       keepdir /var/opt/jfrog/artifactory/run
-
-       newconfd "${FILESDIR}/confd" ${MY_PN}
-       newinitd "${FILESDIR}/initd" ${MY_PN}
-
-       fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-       fperms -R u+w ${TOMCAT_HOME}/work
-}

diff --git a/dev-util/artifactory-bin/artifactory-bin-4.8.1.ebuild 
b/dev-util/artifactory-bin/artifactory-bin-4.8.1.ebuild
deleted file mode 100644
index cc4ae8f9786..00000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.8.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - 
https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of 
artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php";
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip
 -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-               app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-       enewgroup artifactory
-       enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-src_prepare() {
-       default
-
-       if use ssl ; then
-               cp "${FILESDIR}/artifactory.xml" 
tomcat/conf/Catalina/localhost/artifactory.xml || die
-               cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-       fi
-
-       # Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-       sed -i -e 
"s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;"
 \
-               etc/artifactory.system.properties || die
-
-       # See FIXME in src_install(), this can probably go away,
-       # but catalina.sh may need to be fixed for that:
-       sed -i -e 
"s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-               misc/service/setenv.sh || die
-}
-
-src_install() {
-       local ARTIFACTORY_HOME="/opt/artifactory"
-       local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-       insinto ${ARTIFACTORY_HOME}
-       doins -r etc logs misc tomcat webapps
-
-       dodir /etc/opt/jfrog
-       dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-       dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-       exeinto ${ARTIFACTORY_HOME}/bin
-       doexe bin/*
-
-       # FIXME: this is called by catalina.sh (it echoes the variables before 
starting
-       # artifactory, as well as makes sure log dir, etc. exists). Those 
directories
-       # could probably be moved to the ebuild and the script removed from 
catalina.sh
-       # without consequence (and quieter starts). Would need to check if 
CATALINA_*
-       # variables are actually used anywhere (from reading code don't appear 
to be
-       # actually needed)
-       exeinto ${TOMCAT_HOME}/bin
-       doexe misc/service/setenv.sh
-       doexe tomcat/bin/*
-
-       keepdir ${ARTIFACTORY_HOME}/backup
-       keepdir ${ARTIFACTORY_HOME}/data
-       keepdir ${ARTIFACTORY_HOME}/run
-       keepdir ${ARTIFACTORY_HOME}/work
-       keepdir ${TOMCAT_HOME}/logs/catalina
-       keepdir ${TOMCAT_HOME}/temp
-       keepdir ${TOMCAT_HOME}/work
-       keepdir /var/opt/jfrog/artifactory/run
-
-       newconfd "${FILESDIR}/confd" ${MY_PN}
-       newinitd "${FILESDIR}/initd" ${MY_PN}
-
-       fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-       fperms -R u+w ${TOMCAT_HOME}/work
-}

diff --git a/dev-util/artifactory-bin/artifactory-bin-4.8.2.ebuild 
b/dev-util/artifactory-bin/artifactory-bin-4.8.2.ebuild
deleted file mode 100644
index cc4ae8f9786..00000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.8.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - 
https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of 
artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php";
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip
 -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-               app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-       enewgroup artifactory
-       enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-src_prepare() {
-       default
-
-       if use ssl ; then
-               cp "${FILESDIR}/artifactory.xml" 
tomcat/conf/Catalina/localhost/artifactory.xml || die
-               cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-       fi
-
-       # Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-       sed -i -e 
"s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;"
 \
-               etc/artifactory.system.properties || die
-
-       # See FIXME in src_install(), this can probably go away,
-       # but catalina.sh may need to be fixed for that:
-       sed -i -e 
"s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-               misc/service/setenv.sh || die
-}
-
-src_install() {
-       local ARTIFACTORY_HOME="/opt/artifactory"
-       local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-       insinto ${ARTIFACTORY_HOME}
-       doins -r etc logs misc tomcat webapps
-
-       dodir /etc/opt/jfrog
-       dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-       dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-       exeinto ${ARTIFACTORY_HOME}/bin
-       doexe bin/*
-
-       # FIXME: this is called by catalina.sh (it echoes the variables before 
starting
-       # artifactory, as well as makes sure log dir, etc. exists). Those 
directories
-       # could probably be moved to the ebuild and the script removed from 
catalina.sh
-       # without consequence (and quieter starts). Would need to check if 
CATALINA_*
-       # variables are actually used anywhere (from reading code don't appear 
to be
-       # actually needed)
-       exeinto ${TOMCAT_HOME}/bin
-       doexe misc/service/setenv.sh
-       doexe tomcat/bin/*
-
-       keepdir ${ARTIFACTORY_HOME}/backup
-       keepdir ${ARTIFACTORY_HOME}/data
-       keepdir ${ARTIFACTORY_HOME}/run
-       keepdir ${ARTIFACTORY_HOME}/work
-       keepdir ${TOMCAT_HOME}/logs/catalina
-       keepdir ${TOMCAT_HOME}/temp
-       keepdir ${TOMCAT_HOME}/work
-       keepdir /var/opt/jfrog/artifactory/run
-
-       newconfd "${FILESDIR}/confd" ${MY_PN}
-       newinitd "${FILESDIR}/initd" ${MY_PN}
-
-       fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-       fperms -R u+w ${TOMCAT_HOME}/work
-}

diff --git a/dev-util/artifactory-bin/artifactory-bin-4.9.0.ebuild 
b/dev-util/artifactory-bin/artifactory-bin-4.9.0.ebuild
deleted file mode 100644
index cc4ae8f9786..00000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.9.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - 
https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of 
artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php";
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip
 -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-               app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-       enewgroup artifactory
-       enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-src_prepare() {
-       default
-
-       if use ssl ; then
-               cp "${FILESDIR}/artifactory.xml" 
tomcat/conf/Catalina/localhost/artifactory.xml || die
-               cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-       fi
-
-       # Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-       sed -i -e 
"s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;"
 \
-               etc/artifactory.system.properties || die
-
-       # See FIXME in src_install(), this can probably go away,
-       # but catalina.sh may need to be fixed for that:
-       sed -i -e 
"s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-               misc/service/setenv.sh || die
-}
-
-src_install() {
-       local ARTIFACTORY_HOME="/opt/artifactory"
-       local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-       insinto ${ARTIFACTORY_HOME}
-       doins -r etc logs misc tomcat webapps
-
-       dodir /etc/opt/jfrog
-       dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-       dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-       exeinto ${ARTIFACTORY_HOME}/bin
-       doexe bin/*
-
-       # FIXME: this is called by catalina.sh (it echoes the variables before 
starting
-       # artifactory, as well as makes sure log dir, etc. exists). Those 
directories
-       # could probably be moved to the ebuild and the script removed from 
catalina.sh
-       # without consequence (and quieter starts). Would need to check if 
CATALINA_*
-       # variables are actually used anywhere (from reading code don't appear 
to be
-       # actually needed)
-       exeinto ${TOMCAT_HOME}/bin
-       doexe misc/service/setenv.sh
-       doexe tomcat/bin/*
-
-       keepdir ${ARTIFACTORY_HOME}/backup
-       keepdir ${ARTIFACTORY_HOME}/data
-       keepdir ${ARTIFACTORY_HOME}/run
-       keepdir ${ARTIFACTORY_HOME}/work
-       keepdir ${TOMCAT_HOME}/logs/catalina
-       keepdir ${TOMCAT_HOME}/temp
-       keepdir ${TOMCAT_HOME}/work
-       keepdir /var/opt/jfrog/artifactory/run
-
-       newconfd "${FILESDIR}/confd" ${MY_PN}
-       newinitd "${FILESDIR}/initd" ${MY_PN}
-
-       fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-       fperms -R u+w ${TOMCAT_HOME}/work
-}

diff --git a/dev-util/artifactory-bin/artifactory-bin-4.9.1.ebuild 
b/dev-util/artifactory-bin/artifactory-bin-4.9.1.ebuild
deleted file mode 100644
index cc4ae8f9786..00000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.9.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - 
https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of 
artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php";
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip
 -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-               app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-       enewgroup artifactory
-       enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-src_prepare() {
-       default
-
-       if use ssl ; then
-               cp "${FILESDIR}/artifactory.xml" 
tomcat/conf/Catalina/localhost/artifactory.xml || die
-               cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-       fi
-
-       # Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-       sed -i -e 
"s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;"
 \
-               etc/artifactory.system.properties || die
-
-       # See FIXME in src_install(), this can probably go away,
-       # but catalina.sh may need to be fixed for that:
-       sed -i -e 
"s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-               misc/service/setenv.sh || die
-}
-
-src_install() {
-       local ARTIFACTORY_HOME="/opt/artifactory"
-       local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-       insinto ${ARTIFACTORY_HOME}
-       doins -r etc logs misc tomcat webapps
-
-       dodir /etc/opt/jfrog
-       dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-       dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-       exeinto ${ARTIFACTORY_HOME}/bin
-       doexe bin/*
-
-       # FIXME: this is called by catalina.sh (it echoes the variables before 
starting
-       # artifactory, as well as makes sure log dir, etc. exists). Those 
directories
-       # could probably be moved to the ebuild and the script removed from 
catalina.sh
-       # without consequence (and quieter starts). Would need to check if 
CATALINA_*
-       # variables are actually used anywhere (from reading code don't appear 
to be
-       # actually needed)
-       exeinto ${TOMCAT_HOME}/bin
-       doexe misc/service/setenv.sh
-       doexe tomcat/bin/*
-
-       keepdir ${ARTIFACTORY_HOME}/backup
-       keepdir ${ARTIFACTORY_HOME}/data
-       keepdir ${ARTIFACTORY_HOME}/run
-       keepdir ${ARTIFACTORY_HOME}/work
-       keepdir ${TOMCAT_HOME}/logs/catalina
-       keepdir ${TOMCAT_HOME}/temp
-       keepdir ${TOMCAT_HOME}/work
-       keepdir /var/opt/jfrog/artifactory/run
-
-       newconfd "${FILESDIR}/confd" ${MY_PN}
-       newinitd "${FILESDIR}/initd" ${MY_PN}
-
-       fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-       fperms -R u+w ${TOMCAT_HOME}/work
-}

diff --git a/dev-util/artifactory-bin/files/initd 
b/dev-util/artifactory-bin/files/initd
deleted file mode 100644
index 58e16cede4f..00000000000
--- a/dev-util/artifactory-bin/files/initd
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/sbin/openrc-run
-
-description="Manages the services needed to run Artifactory on a dedicated 
Tomcat"
-command="/opt/artifactory/tomcat/bin/catalina.sh"
-pidfile="/opt/artifactory/run/artifactory.pid"
-procname="artifactory"
-user=${ARTIFACTORY_USER:-artifactory}
-group=${group:-artifactory}
-
-# Artifactory can be very slow to start, and without locking,
-# restarting via runscript is very error prone
-CATALINA_LOCK_FILE="$(dirname $pidfile)/lock"
-
-CATALINA_MGMT_PORT=8015
-REQUIRED_JAVA_VERSION="1.8"
-START_TIMEOUT=300
-
-# Helper functions:
-is_mgmt_port_used() {
-    mgmt_port_used=$(netstat -vatn | grep LISTEN | grep $CATALINA_MGMT_PORT | 
wc -l)
-}
-
-get_pid_info() {
-    pidValue=""
-    javaPs=""
-    if [ -e "$pidfile" ]; then
-        pidValue=$(cat $pidfile)
-        if [ -n "$pidValue" ]; then
-            javaPs="$(ps -p $pidValue | grep java)"
-        fi
-    fi
-}
-
-depend() {
-    need net nginx
-    use dns logger netmount
-}
-
-start_pre() {
-    if [ -z "$ARTIFACTORY_HOME" ] || [ ! -d "$ARTIFACTORY_HOME" ]; then
-        eerror "Artifactory home folder not defined or does not exists at 
$ARTIFACTORY_HOME"
-        return 1
-    fi
-
-    if [ -z "$pidfile" ]; then
-        eerror "Artifactory pid destination pidfile was not set!"
-        return 1
-    fi
-
-    if [ -z "$TOMCAT_HOME" ] || [ ! -d "$TOMCAT_HOME" ]; then
-        eerror "Tomcat Artifactory folder not defined or does not exists at 
$TOMCAT_HOME"
-        return 1
-    fi
-
-    if [ -z "$ARTIFACTORY_USER" ]; then
-        ARTIFACTORY_USER=$user
-    fi
-
-    current_open_file_limit=$(su -l $ARTIFACTORY_USER -c "ulimit -n")
-    desired_open_file_limit=32000
-    if [ "$current_open_file_limit" != "unlimited" ] && [ 
$current_open_file_limit -lt $desired_open_file_limit ]; then
-        eerror "Maximum number of open files ($current_open_file_limit) is too 
small!"
-        eerror "You should add:"
-        eerror "artifactory soft nofile $desired_open_file_limit"
-        eerror "artifactory hard nofile $desired_open_file_limit"
-        eerror "to your /etc/security/limits.conf file."
-        return 1
-    fi
-
-    current_max_process_limit=$(su -l $ARTIFACTORY_USER -c "ulimit -u")
-    desired_max_process_limit=1024
-    if [ "$current_max_process_limit" != "unlimited" ] && [ 
$current_max_process_limit -lt $desired_max_process_limit ]; then
-        eerror "Number of processes $current_max_process_limit is too small!"
-        eerror "You should add:"
-        eerror "artifactory soft nproc $desired_max_process_limit"
-        eerror "artifactory hard nproc $desired_max_process_limit"
-        eerror "to your /etc/security/limits.conf file."
-        return 1
-    fi
-
-    if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then
-        einfo "Found java executable in $JAVA_HOME"
-        _java="$JAVA_HOME/bin/java"
-    elif type -p java > dev/null 2>&1 ; then
-        _java=java
-    else
-        eerror "No Java Runtime Environment (jre) found! At least 
java-$REQUIRED_JAVA_VERSION is required."
-        return 1
-    fi
-    if [[ "$_java" ]]; then
-        java_version=$($_java -version 2>&1 | grep 'version' | cut -d ' ' -f3 
| tr -d \")
-        java_major=$(echo $java_version | cut -d . -f1-2)
-        if [ "$java_major" != "$REQUIRED_JAVA_VERSION" ] ; then
-            eerror "Java version $java_version is too old, 
java-$REQUIRED_JAVA_VERSION is required."
-            return 1
-        fi
-    fi
-}
-
-# We have to pass start/stop through to catalina.sh, which doesn't understand 
restart (and restart can't be overridden in OpenRC):
-start() {
-    get_pid_info
-    is_mgmt_port_used
-    if [ $mgmt_port_used -ne 0 ] || [ -n "$javaPs" ]; then
-        eerror "$RC_SERVICE already started!"
-        return 1
-    else
-        ebegin "Starting $RC_SERVICE"
-        start-stop-daemon --exec $command --pidfile $pidfile --user 
$user:$group --wait $START_TIMEOUT start
-        RETVAL=$?
-        eend $RETVAL "start-stop-daemon failed to start $RC_SERVICE"
-    fi
-
-
-    is_mgmt_port_used
-    seconds=1
-    while [ $mgmt_port_used -eq 0 ] && [ $seconds -lt $START_TIMEOUT ]; do
-        sleep 1
-        ((seconds=seconds+1))
-        is_mgmt_port_used
-    done
-    if [ $mgmt_port_used -eq 0 ]; then
-        eerror "$RC_SERVICE did not start in $START_TIMEOUT seconds!"
-        return 1
-    elif [ $mgmt_port_used -eq 1 ]; then
-        einfo "$RC_SERVICE started"
-        [ $RETVAL=0 ] && touch $CATALINA_LOCK_FILE
-    else
-        eerror "Got unexpected result when checking port $CATALINA_MGMT_PORT"
-        return 1
-    fi
-    return $RETVAL
-}
-
-stop() {
-    ebegin "Stopping $RC_SERVICE"
-    start-stop-daemon --stop --pidfile $pidfile --wait $START_TIMEOUT stop
-    RETVAL=$?
-    eend $RETVAL "Failed to stop $RC_SERVICE!"
-
-    [ $RETVAL=0 ] && rm -f "$CATALINA_LOCK_FILE" "$pidfile"
-    return $RETVAL
-}
-
-status() {
-    is_mgmt_port_used
-    if [ $mgmt_port_used -eq 0 ]; then
-        if [ -e "$pidfile" ]; then
-            eerror "$RC_SERVICE stopped but the pid file $pidfile still 
exists!"
-            RETVAL=1
-        else
-            if [ -e "$CATALINA_LOCK_FILE" ]; then
-                eerror "$RC_SERVICE is stopped but the lock file 
$CATALINA_LOCK_FILE still exists!"
-                RETVAL=2
-            else
-                eerror "$RC_SERVICE is stopped"
-                RETVAL=3
-            fi
-        fi
-    else
-        einfo "$RC_SERVICE is running"
-        RETVAL=0
-    fi
-    return $RETVAL
-}

diff --git a/dev-util/artifactory-bin/files/initd-r1 
b/dev-util/artifactory-bin/files/initd-r1
deleted file mode 100644
index 631b698073c..00000000000
--- a/dev-util/artifactory-bin/files/initd-r1
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/sbin/openrc-run
-
-description="Manages the services needed to run Artifactory on a dedicated 
Tomcat"
-command="/opt/artifactory/tomcat/bin/catalina.sh"
-pidfile="/opt/artifactory/run/artifactory.pid"
-procname="artifactory"
-user=${ARTIFACTORY_USER:-artifactory}
-group=${group:-artifactory}
-
-# Artifactory can be very slow to start, and without locking,
-# restarting via runscript is very error prone
-CATALINA_LOCK_FILE="$(dirname $pidfile)/lock"
-
-CATALINA_MGMT_PORT=8015
-REQUIRED_JAVA_VERSION="1.8"
-START_TIMEOUT=300
-
-# Helper functions:
-is_mgmt_port_used() {
-    mgmt_port_used=$(netstat -vatn | grep LISTEN | grep $CATALINA_MGMT_PORT | 
wc -l)
-}
-
-get_pid_info() {
-    pidValue=""
-    javaPs=""
-    if [ -e "$pidfile" ]; then
-        pidValue=$(cat $pidfile)
-        if [ -n "$pidValue" ]; then
-            javaPs="$(ps -p $pidValue | grep java)"
-        fi
-    fi
-}
-
-depend() {
-    need net nginx
-    use dns logger netmount
-}
-
-start_pre() {
-    if [ -z "$ARTIFACTORY_HOME" ] || [ ! -d "$ARTIFACTORY_HOME" ]; then
-        eerror "Artifactory home folder not defined or does not exists at 
$ARTIFACTORY_HOME"
-        return 1
-    fi
-
-    if [ -z "$pidfile" ]; then
-        eerror "Artifactory pid destination pidfile was not set!"
-        return 1
-    fi
-
-    if [ -z "$TOMCAT_HOME" ] || [ ! -d "$TOMCAT_HOME" ]; then
-        eerror "Tomcat Artifactory folder not defined or does not exists at 
$TOMCAT_HOME"
-        return 1
-    fi
-
-    if [ -z "$ARTIFACTORY_USER" ]; then
-        ARTIFACTORY_USER=$user
-    fi
-
-    current_open_file_limit=$(su -l $ARTIFACTORY_USER -c "ulimit -n")
-    desired_open_file_limit=32000
-    if [ "$current_open_file_limit" != "unlimited" ] && [ 
$current_open_file_limit -lt $desired_open_file_limit ]; then
-        eerror "Maximum number of open files ($current_open_file_limit) is too 
small!"
-        eerror "You should add:"
-        eerror "artifactory soft nofile $desired_open_file_limit"
-        eerror "artifactory hard nofile $desired_open_file_limit"
-        eerror "to your /etc/security/limits.conf file."
-        return 1
-    fi
-
-    current_max_process_limit=$(su -l $ARTIFACTORY_USER -c "ulimit -u")
-    desired_max_process_limit=1024
-    if [ "$current_max_process_limit" != "unlimited" ] && [ 
$current_max_process_limit -lt $desired_max_process_limit ]; then
-        eerror "Number of processes $current_max_process_limit is too small!"
-        eerror "You should add:"
-        eerror "artifactory soft nproc $desired_max_process_limit"
-        eerror "artifactory hard nproc $desired_max_process_limit"
-        eerror "to your /etc/security/limits.conf file."
-        return 1
-    fi
-
-    if [ -n "$JAVA_HOME" ] && [ -x "$JAVA_HOME/bin/java" ]; then
-        einfo "Found java executable in $JAVA_HOME"
-        _java="$JAVA_HOME/bin/java"
-    elif command -v java > dev/null 2>&1 ; then
-        _java=java
-    else
-        eerror "No Java Runtime Environment (jre) found! At least 
java-$REQUIRED_JAVA_VERSION is required."
-        return 1
-    fi
-    if [ "$_java" ]; then
-        java_version=$($_java -version 2>&1 | grep 'version' | cut -d ' ' -f3 
| tr -d \")
-        java_major=$(echo $java_version | cut -d . -f1-2)
-        if [ "$java_major" != "$REQUIRED_JAVA_VERSION" ] ; then
-            eerror "Java version $java_version is too old, 
java-$REQUIRED_JAVA_VERSION is required."
-            return 1
-        fi
-    fi
-}
-
-# We have to pass start/stop through to catalina.sh, which doesn't understand 
restart (and restart can't be overridden in OpenRC):
-start() {
-    get_pid_info
-    is_mgmt_port_used
-    if [ $mgmt_port_used -ne 0 ] || [ -n "$javaPs" ]; then
-        eerror "$RC_SERVICE already started!"
-        return 1
-    else
-        ebegin "Starting $RC_SERVICE"
-        start-stop-daemon --exec $command --pidfile $pidfile --user 
$user:$group --wait $START_TIMEOUT start
-        RETVAL=$?
-        eend $RETVAL "start-stop-daemon failed to start $RC_SERVICE"
-    fi
-
-
-    is_mgmt_port_used
-    seconds=1
-    while [ $mgmt_port_used -eq 0 ] && [ $seconds -lt $START_TIMEOUT ]; do
-        sleep 1
-        $((seconds=seconds+1))
-        is_mgmt_port_used
-    done
-    if [ $mgmt_port_used -eq 0 ]; then
-        eerror "$RC_SERVICE did not start in $START_TIMEOUT seconds!"
-        return 1
-    elif [ $mgmt_port_used -eq 1 ]; then
-        einfo "$RC_SERVICE started"
-        [ $RETVAL=0 ] && touch $CATALINA_LOCK_FILE
-    else
-        eerror "Got unexpected result when checking port $CATALINA_MGMT_PORT"
-        return 1
-    fi
-    return $RETVAL
-}
-
-stop() {
-    ebegin "Stopping $RC_SERVICE"
-    start-stop-daemon --stop --pidfile $pidfile --wait $START_TIMEOUT stop
-    RETVAL=$?
-    eend $RETVAL "Failed to stop $RC_SERVICE!"
-
-    [ $RETVAL=0 ] && rm -f "$CATALINA_LOCK_FILE" "$pidfile"
-    return $RETVAL
-}
-
-status() {
-    is_mgmt_port_used
-    if [ $mgmt_port_used -eq 0 ]; then
-        if [ -e "$pidfile" ]; then
-            eerror "$RC_SERVICE stopped but the pid file $pidfile still 
exists!"
-            RETVAL=1
-        else
-            if [ -e "$CATALINA_LOCK_FILE" ]; then
-                eerror "$RC_SERVICE is stopped but the lock file 
$CATALINA_LOCK_FILE still exists!"
-                RETVAL=2
-            else
-                eerror "$RC_SERVICE is stopped"
-                RETVAL=3
-            fi
-        fi
-    else
-        einfo "$RC_SERVICE is running"
-        RETVAL=0
-    fi
-    return $RETVAL
-}

Reply via email to