From 1bc7a62f0cfeb2d45d1306f10407590e2226d0ef Mon Sep 17 00:00:00 2001 From: Micha Glave Date: Wed, 21 Oct 2015 08:38:59 +0000 Subject: [PATCH] artifactory updated, removed outdated packages. --- dev-java/artifactory/Manifest | 4 +-- ...-3.2.0.ebuild => artifactory-4.2.0.ebuild} | 27 +++++++++---------- dev-python/genshi/Manifest | 2 +- dev-python/genshi/genshi-0.7.ebuild | 13 ++++----- sys-kernel/xen-sources/Manifest | 4 --- .../xen-sources/xen-sources-2.6.31-r7.ebuild | 27 ------------------- 6 files changed, 23 insertions(+), 54 deletions(-) rename dev-java/artifactory/{artifactory-3.2.0.ebuild => artifactory-4.2.0.ebuild} (77%) delete mode 100644 sys-kernel/xen-sources/Manifest delete mode 100644 sys-kernel/xen-sources/xen-sources-2.6.31-r7.ebuild diff --git a/dev-java/artifactory/Manifest b/dev-java/artifactory/Manifest index 0423119..b11f06d 100644 --- a/dev-java/artifactory/Manifest +++ b/dev-java/artifactory/Manifest @@ -1,2 +1,2 @@ -DIST artifactory-3.2.0.zip 34410104 SHA256 574ede95da281dd21dba1bd5f82d651d15031d3241b8b7e22b49c03cb786d123 SHA512 a50bae1598242e9a1ffcef85327a1518414e563ddafed658fe5a7aede9e3d5436ecd2b08fe2fb3a84c317e64ae16442d431b4bac2f9852b5aad8df0a57e15d07 WHIRLPOOL a36382b62f6bb0b1094a1b5fb5e590fb9e25cca1181f918e06d3249c07f36a0dd754ae6a67af63d7322bc186e88bedbeb27e759142707ced39f340930109bc02 -EBUILD artifactory-3.2.0.ebuild 2367 SHA256 755a143214d036a5da2e05cd5297383f74c246d77cde8681a0c0d85cdf1b2173 SHA512 76b50f14086d5433e366ff2d55d7983d8f94f5241b049a89096f47924afe51378be79bcc60dc70133a3e8bd957bd07d80bc828b0c8a83ae476fb62f30ef16934 WHIRLPOOL 849743b5d207651d02bb7a0a9117e31f35e2bdf2c6c5b05ba51cfd00345c395e952566a59d088d104cedf8ed59466e603fe7a050a94bfa9b5f389c2587c60faa +DIST jfrog-artifactory-oss-4.2.0.zip 35372795 SHA256 13bf200f0a75ee67aeec25979fe6a99bcf7f1018b08ad681c33436a149dab7cc SHA512 d2cd2ecbf5f2fabbc1276cfef112c24d86d94d426ae2a5a0cd956e7cb2b39d2c48c052cde2414e728f88c66dd399a6fe8c563022208f3cedab40be9af6ce3de2 WHIRLPOOL 382df6b70ab34b1e96a06129b18c53f17c81244aca358c30f32b3a7e68764ae78b2309ecdd5e5a8471278885b64600cce9f92e146122e352874794a417e6e67d +EBUILD artifactory-4.2.0.ebuild 2363 SHA256 fd05f60f0fadde9a32b2cc7bc8116791b151dd76c427bfa1a2e8b2a30e155abc SHA512 80adbdd7424bb7c37416a47e948e3a42b1fb566f266ac4d479fd558f7280c040f9a68a5ed2c93c3429a8660379cf7388bcb24e73b5de2a6b5df6e8406f0cd0ae WHIRLPOOL c653b66f1666338642478dfbdf511c2ed6a7c9dc16b2bc230b83754b165809b12fa3cd0e3b7bec0a66fc8152fecc0fc76a75a1b90566a1c7bcf125efadd385f0 diff --git a/dev-java/artifactory/artifactory-3.2.0.ebuild b/dev-java/artifactory/artifactory-4.2.0.ebuild similarity index 77% rename from dev-java/artifactory/artifactory-3.2.0.ebuild rename to dev-java/artifactory/artifactory-4.2.0.ebuild index 94e5775..7258492 100644 --- a/dev-java/artifactory/artifactory-3.2.0.ebuild +++ b/dev-java/artifactory/artifactory-4.2.0.ebuild @@ -1,26 +1,26 @@ # copyright (c) 2014 migmedia EAPI="5" -inherit eutils java-pkg-2 +inherit eutils java-pkg-2 user DESCRIPTION="Artifactory Maven Artifact Server" HOMEPAGE="http://www.jfrog.org/products.php" +MY_PN="artifactory-oss" SLOT="0" -RESTRICT="mirror" -SRC_URI="mirror://sourceforge/${PN}/${P}.zip" +SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-${MY_PN}-${PV}.zip" KEYWORDS="~amd64 ~x86" LICENSE="LGPL-3" IUSE="mysql postgres" RDEPEND="virtual/jre:1.7 - >=www-servers/tomcat-7.0.52 + >=www-servers/tomcat-8.0.00 dev-java/jsr305 mysql? ( dev-java/jdbc-mysql ) " DEPEND="virtual/jdk:1.7 - >=www-servers/tomcat-7.0.52 + >=www-servers/tomcat-8.0.00 dev-java/jsr305 mysql? ( dev-java/jdbc-mysql ) " @@ -28,13 +28,15 @@ DEPEND="virtual/jdk:1.7 ARTIFACTORY_HOME=/var/lib/${PN} ARTIFACTORY_USER=artifact TOMCAT_SUFFIX=${ARTIFACTORY_USER} -CONTAINER=/var/lib/tomcat-7-$TOMCAT_SUFFIX +CONTAINER=/var/lib/tomcat-8-$TOMCAT_SUFFIX + +S=${WORKDIR}/${MY_PN}-${PV} pkg_setup() { enewgroup artifact enewuser ${ARTIFACTORY_USER} -1 /bin/sh -1 artifact - if [[ ! -d /etc/tomcat-7-${TOMCAT_SUFFIX} ]] ; then - /usr/share/tomcat-7/gentoo/tomcat-instance-manager.bash --create --suffix ${TOMCAT_SUFFIX} \ + if [[ ! -d /etc/tomcat-8-${TOMCAT_SUFFIX} ]] ; then + /usr/share/tomcat-8/gentoo/tomcat-instance-manager.bash --create --suffix ${TOMCAT_SUFFIX} \ --user ${ARTIFACTORY_USER} --group artifact fi } @@ -51,12 +53,9 @@ src_prepare() { } src_install() { - diropts -m775 -o ${ARTIFACTORY_USER} -g artifact - keepdir ${ARTIFACTORY_HOME}/backup - keepdir ${ARTIFACTORY_HOME}/data - keepdir ${ARTIFACTORY_HOME}/work - keepdir ${ARTIFACTORY_HOME}/etc - keepdir /var/log/artifactory + diropts -m0775 -o ${ARTIFACTORY_USER} -g artifact + keepdir ${ARTIFACTORY_HOME}/{backup,data,work,etc} + keepdir /var/log/${PN} insinto ${CONTAINER}/webapps doins webapps/${PN}.war diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest index 9dace0e..d05ff43 100644 --- a/dev-python/genshi/Manifest +++ b/dev-python/genshi/Manifest @@ -1,3 +1,3 @@ AUX ticket566-genshi-0.6.x-r1238.diff 1537 SHA256 c58e53c7b2d6183512d83a7f98bf413dc7ac627d4485ce33a5cec37db4eb5390 SHA512 ec22d941d03ecab9f6cc08baf15fa46e36c99e42600c51e9d6d530ad58a29a2105d2fe653185cf9b7d62759a17c61eeaef49d221149e0a39ad23a2b2818c035a WHIRLPOOL e063e94e681fb757f16e8d52982535e2af9d3d61c72a1e4c7c92a9eaec541eabce7eca7f9f17b5371057054f23fa748140443b83b51cef8d81864dceb2bab634 DIST Genshi-0.7.tar.gz 491579 SHA256 1d154402e68bc444a55bcac101f96cb4e59373100cc7a2da07fbf3e5cc5d7352 SHA512 2d0042d4da4566725ddd80b73c5b7be09f479f5529e4aa69903edc2a98905ff6de42a0d5a6f02986d7962deb7740c4a3acf6955a8b77fdb42d3cf4ca037de6bf WHIRLPOOL 5e1a7af061d28a581c8a028ae7343a2b80697eb8bca01c8609345a3f2146db190a596d3488c0bde5aa132ac930d591ff1babd033ccb532c7cac7d2931751f906 -EBUILD genshi-0.7.ebuild 1031 SHA256 89592889daf1688f5c2f2ddefdc2987bab5492e59d61add55dbeec0f135f2d8e SHA512 d1e2e2f79d834f37247d3395921b5606e97b5a92e0f9f6a0802f1c865f0837bd086346a6ef0b496273b3725fbda718a7b344e529c0ae94b2f5cb4139b7d3b567 WHIRLPOOL d2ff39b9639f109b99ba3c48695ca399a72f296fb01813168ca6fdb2ee05b51f98ddcbf755ba2c8ab455b3da498e18ba42edb05f12d663b96fe324dd32000c97 +EBUILD genshi-0.7.ebuild 973 SHA256 7bc6a89b1335fefe0fad8f4b5cddba5e24fc2b531396a573a97f75f867f48459 SHA512 686460a114b1e2322d2670f01804202e08fbd70401de26ed4c2a8de726afc480ae8d851df8bcc9e8bf08cd49c7a1913f7d1720c0975b47b66794a016fb32c068 WHIRLPOOL 6edb001637a00107449bda1a2ca8c46a75fa0b4e091b209be631164cc8b4aad358aba3fb96ac288cc38e8253b26f971de56cc893c6b320938e91f34c3fff0eb1 diff --git a/dev-python/genshi/genshi-0.7.ebuild b/dev-python/genshi/genshi-0.7.ebuild index cc4c950..8b696b2 100644 --- a/dev-python/genshi/genshi-0.7.ebuild +++ b/dev-python/genshi/genshi-0.7.ebuild @@ -1,24 +1,24 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/genshi/genshi-0.7.ebuild,v 1.4 2013/06/25 13:01:14 ago Exp $ +# $Id$ EAPI=5 -PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} ) +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) inherit distutils-r1 MY_P="Genshi-${PV}" DESCRIPTION="Python toolkit for stream-based generation of output for the web." -HOMEPAGE="http://genshi.edgewall.org/ http://pypi.python.org/pypi/Genshi" +HOMEPAGE="http://genshi.edgewall.org/ https://pypi.python.org/pypi/Genshi" SRC_URI="http://ftp.edgewall.com/pub/genshi/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="doc examples" -DEPEND="dev-python/setuptools" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_P}" @@ -40,4 +40,5 @@ python_install_all() { insinto /usr/share/doc/${PF} doins -r examples fi + distutils-r1_python_install_all } diff --git a/sys-kernel/xen-sources/Manifest b/sys-kernel/xen-sources/Manifest deleted file mode 100644 index 6c6e10c..0000000 --- a/sys-kernel/xen-sources/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST genpatches-2.6.31-5.base.tar.bz2 112611 RMD160 dab5d152b178a2384008522c4070dd783a6c8df3 SHA1 b89564aa873f71f98d33e95a776761952ffef619 SHA256 03ae19a723974c6fc17eb05a4e202495c5eb1dcc0003313c1f60341eb6458707 -DIST linux-2.6.31.tar.bz2 61494822 RMD160 c0d88e63740abf0d4f9d82557260a31643f5a01b SHA1 c6e0e6b473ba2b80d164e37cfabf294e783c03d9 SHA256 0acd83f7b85db7ee18c2b0b7505e1ba6fd722c36f49a8870a831c851660e3512 -DIST xen-patches-2.6.31-7.tar.bz2 1826571 RMD160 1163991c69e66ff8d99e51ce93fe721aed24cd37 SHA1 334f18c963dd4f2527629f7aa9be233f621d0d96 SHA256 6c045bed7aa47fa99c04971bdd78088050434aa2e4cf85e0ec6ed5cfcada3417 -EBUILD xen-sources-2.6.31-r7.ebuild 754 RMD160 2ba69763a69ec4d535239aa7a1285d202de8b1c8 SHA1 5ec4db978125aecd7ee2e048b874eafd4504e475 SHA256 4ce492223c90befda82d598ce91cc1eea20c8cbece6275e05274e03e49dd6b56 diff --git a/sys-kernel/xen-sources/xen-sources-2.6.31-r7.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.31-r7.ebuild deleted file mode 100644 index 0a01d96..0000000 --- a/sys-kernel/xen-sources/xen-sources-2.6.31-r7.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/xen-sources-2.6.21.ebuild,v 1.3 2008/08/31 17:44:43 rbu Exp $ - -ETYPE="sources" -UNIPATCH_STRICTORDER="1" -K_WANT_GENPATCHES="base" -K_GENPATCHES_VER="5" -inherit kernel-2 -detect_version - -DESCRIPTION="Full sources for a dom0/domU Linux kernel to run under Xen" -HOMEPAGE="http://xen.org/" -IUSE="" - -KEYWORDS="~x86 ~amd64" - -XENPATCHES_VER="7" -XENPATCHES="xen-patches-${PV}-${XENPATCHES_VER}.tar.bz2" -XENPATCHES_URI="mirror://gentoo/${XENPATCHES}" - -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${XENPATCHES_URI}" - - -UNIPATCH_LIST="${DISTDIR}/${XENPATCHES}" - -DEPEND="${DEPEND} >=sys-devel/binutils-2.17"