From bcd779b7470efe5a2b4d3a207bbadfd70a0e7d23 Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Fri, 25 Sep 2015 01:01:31 +1000 Subject: [PATCH 1/5] kde-base/libkgreeter: relax blocker. Gentoo-bug: 561376 Package-Manager: portage-2.2.20.1 --- kde-base/libkgreeter/libkgreeter-4.11.19.ebuild | 2 +- kde-base/libkgreeter/libkgreeter-4.11.22.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-base/libkgreeter/libkgreeter-4.11.19.ebuild b/kde-base/libkgreeter/libkgreeter-4.11.19.ebuild index 64be188209a8c..b8af0656248de 100644 --- a/kde-base/libkgreeter/libkgreeter-4.11.19.ebuild +++ b/kde-base/libkgreeter/libkgreeter-4.11.19.ebuild @@ -13,7 +13,7 @@ KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux" IUSE="debug" DEPEND=" - ! Date: Thu, 24 Sep 2015 17:02:27 +0200 Subject: [PATCH 2/5] net-misc/htpdate: Bump to version 1.1.2 Package-Manager: portage-2.2.21 Signed-off-by: Lars Wendler --- net-misc/htpdate/Manifest | 1 + net-misc/htpdate/htpdate-1.1.2.ebuild | 41 +++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 net-misc/htpdate/htpdate-1.1.2.ebuild diff --git a/net-misc/htpdate/Manifest b/net-misc/htpdate/Manifest index 4212b089ea0dc..e8c9fa813e371 100644 --- a/net-misc/htpdate/Manifest +++ b/net-misc/htpdate/Manifest @@ -1,2 +1,3 @@ DIST htpdate-1.0.7.tar.gz 16848 SHA256 ba0b3f7b42306f2e2e146624785f80cc472eac9e7885007df50af0e1a21735c4 SHA512 83408545d1d2cc794f62efaf348e54cc2ce47dfb27815710e92d0c7d34360a581e637ef82424030c8a4fcabcc9a07205518fac08f426b37c7c4519cfa6696360 WHIRLPOOL e2e949d20b8d4afecd6c3c09aefa203417b16a4061e6d2fe05cf5e37d0dc736604ed5e1f0d8c03146eb3b5031ffc3ed8ec3213171513e6140a098bd1d5f268fb DIST htpdate-1.1.1.tar.gz 13303 SHA256 6fca5f13e323d4bf8e4a2ae20dfaae527b745b3cf19e9aeccfe2f211e7cc7a7a SHA512 bfc463692b7c4fb962c0b6f34e6063d2506e383490e6d6972b7da3740fbd0b835a07cddd3470bea29f8d2770160fba5f87fd3d768cb27a1f04ea9f5a39522918 WHIRLPOOL 7faa7ce4dd96d48a2a7ddc20a61a7230d9658042f3c9e39229ade41a312d78a0d5827a3348b2671de36fdbcb0aa35873fa5bee6e0c13218e94fbc23f3f2730b7 +DIST htpdate-1.1.2.tar.gz 13330 SHA256 6babf7db26f8734aa245a261ebdd6b92989ed4ffd1db40f8480b33d4150488d2 SHA512 d20234b3f04499b77f7050522c23dc6c3d8fc27a22368e8553340eec76ce35964f7f9808a0e047840fcdbb1e61dfd9fa9e9cdb5d88c42d5f8970a62203fde424 WHIRLPOOL 82b8e088c4e45264abbd2a35c25729cb6afc3f3d8e47d11bfc06b0bb7f89eb85a8a5c475dcbf1c9007288248eef351291184f17d0b615fe937f7277f431b3c05 diff --git a/net-misc/htpdate/htpdate-1.1.2.ebuild b/net-misc/htpdate/htpdate-1.1.2.ebuild new file mode 100644 index 0000000000000..d70048232eea3 --- /dev/null +++ b/net-misc/htpdate/htpdate-1.1.2.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit readme.gentoo toolchain-funcs unpacker + +DESCRIPTION="Synchronize local workstation with time offered by remote webservers" +HOMEPAGE="http://www.vervest.org/fiki/bin/view/HTP/DownloadC" +SRC_URI="http://www.vervest.org/htp/archive/c/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux" + +DEPEND="" +RDEPEND="" + +DOC_CONTENTS="If you would like to run htpdate as a daemon, set +appropriate http servers in /etc/conf.d/htpdate!" + +src_prepare() { + # Use more standard adjtimex() to fix uClibc builds. + sed -i 's:ntp_adjtime:adjtimex:g' htpdate.[8c] || die +} + +src_compile() { + emake CFLAGS="-Wall ${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" +} + +src_install() { + dosbin htpdate + doman htpdate.8 + dodoc README Changelog + + newconfd "${FILESDIR}"/htpdate.conf htpdate + newinitd "${FILESDIR}"/htpdate.init-r1 htpdate + + readme.gentoo_create_doc +} From 4e3f55ac5f453675d6a3eec9d820c475251bac56 Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Fri, 25 Sep 2015 01:08:20 +1000 Subject: [PATCH 3/5] kde-apps/kgpg: version bump Package-Manager: portage-2.2.20.1 --- kde-apps/kgpg/Manifest | 1 + kde-apps/kgpg/kgpg-15.08.1.ebuild | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 kde-apps/kgpg/kgpg-15.08.1.ebuild diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest index 4f3c98f97ecb6..bd95b18fa46a1 100644 --- a/kde-apps/kgpg/Manifest +++ b/kde-apps/kgpg/Manifest @@ -1 +1,2 @@ +DIST kgpg-15.08.1.tar.xz 810096 SHA256 8a64e4993d3ae774378aab74abd1727178a83ba726b4d0eaca0e83d3ccba481c SHA512 a691d7bff1c979c2e3cefa2f56fc0a77453ff0d84e8cbeb4747d6eb160fd9c05a93d80d004ba95af4f0f47bd3dddbf395f8670c5ef3fd572bce5895eb17f918a WHIRLPOOL 59e04a14af2c93fd6827cea4c650048d0e6d4be311ff0e980ab3ec58014e9613cecfe81a8f664404c7ee013ecf50215a8e7b839055b7655edb807ae5dde06dd0 DIST kgpg-4.14.3.tar.xz 807076 SHA256 bc7d37a935c5b1bb6b0f32abc62635d17ac8fbadc2ed6cfd314af71aee2d0c46 SHA512 692b713cc307da9de20d3e2f249271a33d87386e44feeab89e29c419f8cb66aa20717ac296678006f2f1a48d444fa300be1a15a3d810f3541bc54c10836a1a1d WHIRLPOOL 2ebb68847e4af57fccb4f8c85690a74fef2a23bdf7407044abb28c4de18542bb4a4ad2fa817dbde8f497f5c6f2d3a701052bb9e63b0a8a7bd8fe166e1f3c77a5 diff --git a/kde-apps/kgpg/kgpg-15.08.1.ebuild b/kde-apps/kgpg/kgpg-15.08.1.ebuild new file mode 100644 index 0000000000000..b3c9c94954719 --- /dev/null +++ b/kde-apps/kgpg/kgpg-15.08.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +KDE_HANDBOOK="optional" +KDE_SELINUX_MODULE="gpg" +inherit kde4-base + +DESCRIPTION="KDE gpg keyring manager" +HOMEPAGE="https://www.kde.org/applications/utilities/kgpg +https://utils.kde.org/projects/kgpg" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug" + +DEPEND=" + $(add_kdebase_dep kdepimlibs) +" +RDEPEND="${DEPEND} + app-crypt/gnupg +" + +pkg_postinst() { + kde4-base_pkg_postinst + + if ! has_version 'app-crypt/dirmngr' && ! has_version '>=app-crypt/gnupg-2.1'; then + elog "For improved key search functionality, install app-crypt/dirmngr." + fi +} From 3aec332913ec2554fe35654e066e8baa6a844827 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Thu, 24 Sep 2015 16:12:06 +0100 Subject: [PATCH 4/5] dev-java/jnr-enxio: Bump Java version to 7, fixes bug #561352 Bumping the Java version demands a revbump but it should still be safe enough to commit straight to stable. Package-Manager: portage-2.2.20.1 --- .../{jnr-enxio-0.7.ebuild => jnr-enxio-0.7-r1.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename dev-java/jnr-enxio/{jnr-enxio-0.7.ebuild => jnr-enxio-0.7-r1.ebuild} (95%) diff --git a/dev-java/jnr-enxio/jnr-enxio-0.7.ebuild b/dev-java/jnr-enxio/jnr-enxio-0.7-r1.ebuild similarity index 95% rename from dev-java/jnr-enxio/jnr-enxio-0.7.ebuild rename to dev-java/jnr-enxio/jnr-enxio-0.7-r1.ebuild index dc7cc8245690c..e198a6a71f81d 100644 --- a/dev-java/jnr-enxio/jnr-enxio-0.7.ebuild +++ b/dev-java/jnr-enxio/jnr-enxio-0.7-r1.ebuild @@ -20,10 +20,10 @@ CDEPEND="dev-java/jnr-constants:0 dev-java/jnr-ffi:2" DEPEND="${CDEPEND} - >=virtual/jdk-1.6" + >=virtual/jdk-1.7" RDEPEND="${CDEPEND} - >=virtual/jre-1.6" + >=virtual/jre-1.7" java_prepare() { cp "${FILESDIR}"/${P}-build.xml build.xml || die From bcb30ea6b81ca973d39bfc0f901323efa2749f98 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Thu, 24 Sep 2015 16:18:03 +0100 Subject: [PATCH 5/5] dev-java/jnr-unixsocket: Bump Java version to 7 as jnr-enxio also has This relates to bug #561352. jnr-unixsocket builds with Java 6 but it should have a Java version at least as high as its dependencies. I have also changed the jnr-ffi SLOT to match the one used by jnr-enxio, otherwise you end up with two conflicting versions on the classpath. jruby (a revdep) also uses the older version but it is masked and totally broken anyway. This demands a revbump but should still be safe enough to commit straight to stable. Package-Manager: portage-2.2.20.1 --- ...unixsocket-0.6.ebuild => jnr-unixsocket-0.6-r1.ebuild} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename dev-java/jnr-unixsocket/{jnr-unixsocket-0.6.ebuild => jnr-unixsocket-0.6-r1.ebuild} (86%) diff --git a/dev-java/jnr-unixsocket/jnr-unixsocket-0.6.ebuild b/dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild similarity index 86% rename from dev-java/jnr-unixsocket/jnr-unixsocket-0.6.ebuild rename to dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild index e1a54ccc7f336..f5936f9bbe6fd 100644 --- a/dev-java/jnr-unixsocket/jnr-unixsocket-0.6.ebuild +++ b/dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild @@ -19,20 +19,20 @@ LICENSE="Apache-2.0" CDEPEND="dev-java/jnr-constants:0 dev-java/jnr-enxio:0 dev-java/jnr-posix:3.0 - dev-java/jnr-ffi:0.7" + dev-java/jnr-ffi:2" DEPEND="${CDEPEND} - >=virtual/jdk-1.6" + >=virtual/jdk-1.7" RDEPEND="${CDEPEND} - >=virtual/jre-1.6" + >=virtual/jre-1.7" java_prepare() { cp "${FILESDIR}"/${P}-build.xml build.xml || die } JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="jnr-constants,jnr-enxio,jnr-ffi-0.7,jnr-posix-3.0" +EANT_GENTOO_CLASSPATH="jnr-constants,jnr-enxio,jnr-ffi-2,jnr-posix-3.0" src_install() { java-pkg_newjar target/${P}.jar ${PN}.jar