[gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
commit: 4a081c7208cc3cee88197e22690c550e80d0cc91
Author: Anthony G. Basile gentoo org>
AuthorDate: Thu Sep 3 07:13:05 2015 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Thu Sep 3 07:13:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a081c72
www-servers/monkeyd: remove older versions.
Package-Manager: portage-2.2.20.1
www-servers/monkeyd/Manifest | 3 -
www-servers/monkeyd/monkeyd-1.5.3.ebuild | 144 ---
www-servers/monkeyd/monkeyd-1.5.5.ebuild | 144 ---
www-servers/monkeyd/monkeyd-1.6.1.ebuild | 139 -
4 files changed, 430 deletions(-)
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index abe7245..29e9b39 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,5 +1,2 @@
-DIST monkey-1.5.3.tar.gz 892478 SHA256
0ac300e04f052818bc26b7da0183c3c5cd13be8090aaabd3505838587be8c0ec SHA512
6a55ba580bfde3c11329e94055d287e341990e4db4cb5ab12e40b8bab57b4b51fd57cd33fc5aa9d864127f235888f818593be26fe93daa34ca3c40fa8936465f
WHIRLPOOL
4038bd2f0b39f6068ab69dc98dec4d5b29feca388c18361f57b653db86c38469d69072ae803ddd565e57350163247072334835216a13d014956a27b91c8a42b6
-DIST monkey-1.5.5.tar.gz 898602 SHA256
5a0554fdb4d8746f5eb665f305bd120c8f2bef3e7fea2a43be6b472461b45b05 SHA512
faf86a36a91c8b1e47f3a2ea7f19aee98eada6f3348ff64f160fc388c268a146d49ad9434043731cf928fca6708db40fa5e1daedc41d4b8cce671f98d590b920
WHIRLPOOL
26b44624f77b72bbd31da6be5855429199a0fc9ab163548f1d0f21a34b84a1f0325241ed7ad5ecbb28c9e9f899458b5d8c15f9f91e27b73a53023c2e3152947d
DIST monkey-1.5.6.tar.gz 902636 SHA256
7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512
4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c
WHIRLPOOL
aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
-DIST monkey-1.6.1.tar.gz 1916812 SHA256
acf2ba04578c362b2b1c509ee4a998b6b2951e51b16bd339d300743de1752961 SHA512
c7c0f83bb74193bfd7008a0327012a45474b65befb47ac514d3a10095c41aeb2ec49067249377d18cc3a6ec77eb14c5ae25e36d2550e47971a43e156ef24d619
WHIRLPOOL
70545f343b6675d456b4ed426ad27435302c0e122f1b26640e3aa65343a5912af4c431d799f018fe19f3183c904a876fc157f5f0e257f6dcf9b76cf2422ed1f0
DIST monkey-1.6.2.tar.gz 1913867 SHA256
d26ff514d64bb2de503a9a4d61fce20d89deff0f2f9f958977db4b98e44ece3e SHA512
2fe3b82386d580974509b03ea66caa05adec76178296d736d994ff7f4aedd52fcd298fad083050c59378b1a6cc37cbe8fd34c437a95830fd78304c710bb16b8b
WHIRLPOOL
1b1bc34b0534130ce489040e2283d9b074c43ca58f9005832ceb92be92d38e70e482daf405022e1933a9300b782231747d91f937a5b2468a44f0eaa5a4fb984a
diff --git a/www-servers/monkeyd/monkeyd-1.5.3.ebuild
b/www-servers/monkeyd/monkeyd-1.5.3.ebuild
deleted file mode 100644
index dc0aeca..000
--- a/www-servers/monkeyd/monkeyd-1.5.3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit toolchain-funcs depend.php multilib
-
-MY_P="${PN/d}-${PV}"
-DESCRIPTION="A small, fast, and scalable web server"
-HOMEPAGE="http://www.monkey-project.com/";
-SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
-
-# ssl is broken, so we turn it off until fixed
-IUSE="-debug jemalloc php minimal elibc_musl elibc_uclibc monkeyd_plugins_auth
monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi
+monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril"
-
-# uclibc is often compiled without backtrace info so we should
-# force this off. If someone complains, consider relaxing it.
-# ssl is borken, so we remove "ssl? ( monkeyd_plugins_polarssl )"
-REQUIRED_USE="elibc_uclibc? ( !debug )"
-
-DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
-RDEPEND="php? ( dev-lang/php )"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBROOT="/var/www/localhost"
-
-pkg_setup() {
- use php && require_php_cgi
-
- if use debug; then
- ewarn
- ewarn
"\033[1;33m**\033[00m"
- ewarn "Do not use debug in production!"
- ewarn
"\033[1;33m**\033[00m"
- ewarn
- fi
-}
-
-src_prepare() {
- # Unconditionally get rid of the bundled jemalloc
- rm -rf "${S}"/deps
- epatch "${FILESDIR}"/${PN}-1.5.2-use-system-jemalloc.patch
- epatch "${FILESDIR}"/${PN}-1.5.0-fix-CPPFLAGS.patch
-
- # Don't install the banana script, we use ${FILESDIR}/monkeyd.initd
instead
- sed -i '/Creating bin\/banana/d' configure || die "No configure file"
- sed -i '/create_banana_script bindir/d' configure || die "No configure
file"
-
-
[gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/
commit: 30af9daa5f5febccafd7b767db2ebdc13dd226fc
Author: Anthony G. Basile gentoo org>
AuthorDate: Thu Sep 3 07:09:36 2015 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Thu Sep 3 07:13:19 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30af9daa
www-servers/monkeyd: version bump to 1.6.2
Package-Manager: portage-2.2.20.1
www-servers/monkeyd/Manifest | 1 +
www-servers/monkeyd/monkeyd-1.6.2.ebuild | 139 +++
2 files changed, 140 insertions(+)
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index ff2c241..abe7245 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -2,3 +2,4 @@ DIST monkey-1.5.3.tar.gz 892478 SHA256
0ac300e04f052818bc26b7da0183c3c5cd13be809
DIST monkey-1.5.5.tar.gz 898602 SHA256
5a0554fdb4d8746f5eb665f305bd120c8f2bef3e7fea2a43be6b472461b45b05 SHA512
faf86a36a91c8b1e47f3a2ea7f19aee98eada6f3348ff64f160fc388c268a146d49ad9434043731cf928fca6708db40fa5e1daedc41d4b8cce671f98d590b920
WHIRLPOOL
26b44624f77b72bbd31da6be5855429199a0fc9ab163548f1d0f21a34b84a1f0325241ed7ad5ecbb28c9e9f899458b5d8c15f9f91e27b73a53023c2e3152947d
DIST monkey-1.5.6.tar.gz 902636 SHA256
7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512
4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c
WHIRLPOOL
aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
DIST monkey-1.6.1.tar.gz 1916812 SHA256
acf2ba04578c362b2b1c509ee4a998b6b2951e51b16bd339d300743de1752961 SHA512
c7c0f83bb74193bfd7008a0327012a45474b65befb47ac514d3a10095c41aeb2ec49067249377d18cc3a6ec77eb14c5ae25e36d2550e47971a43e156ef24d619
WHIRLPOOL
70545f343b6675d456b4ed426ad27435302c0e122f1b26640e3aa65343a5912af4c431d799f018fe19f3183c904a876fc157f5f0e257f6dcf9b76cf2422ed1f0
+DIST monkey-1.6.2.tar.gz 1913867 SHA256
d26ff514d64bb2de503a9a4d61fce20d89deff0f2f9f958977db4b98e44ece3e SHA512
2fe3b82386d580974509b03ea66caa05adec76178296d736d994ff7f4aedd52fcd298fad083050c59378b1a6cc37cbe8fd34c437a95830fd78304c710bb16b8b
WHIRLPOOL
1b1bc34b0534130ce489040e2283d9b074c43ca58f9005832ceb92be92d38e70e482daf405022e1933a9300b782231747d91f937a5b2468a44f0eaa5a4fb984a
diff --git a/www-servers/monkeyd/monkeyd-1.6.2.ebuild
b/www-servers/monkeyd/monkeyd-1.6.2.ebuild
new file mode 100644
index 000..e0f0159
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-1.6.2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="A small, fast, and scalable web server"
+HOMEPAGE="http://www.monkey-project.com/";
+MY_P="${PN/d}-${PV}"
+if [[ ${PV} == "" ]] ; then
+ EGIT_REPO_URI="https://github.com/monkey/monkey.git";
+ inherit git-2
+ KEYWORDS=""
+else
+ SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz";
+ KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Currently monkeyd_plugins_tls is off. It provides mbed TLS (formerly
PolarSSL).
+# jemalloc is also off until we figure out how to work CMakeLists.txt magic.
+#PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah
monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger
monkeyd_plugins_mandril monkeyd_plugins_tls"
+#IUSE="cgi -debug fastcgi jemalloc php static-plugins ${PLUGINS}"
+
+PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah
monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger
monkeyd_plugins_mandril"
+IUSE="cgi -debug fastcgi php static-plugins ${PLUGINS}"
+
+# uclibc is often compiled without backtrace info so we should
+# force this off. If someone complains, consider relaxing it.
+REQUIRED_USE="
+ elibc_uclibc? ( !debug )
+ cgi? ( php )"
+
+#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
+DEPEND="dev-util/cmake"
+RDEPEND="
+ php? ( dev-lang/php )
+ cgi? ( dev-lang/php[cgi] )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBROOT="/var/www/localhost"
+
+pkg_setup() {
+ if use debug; then
+ ewarn
+ ewarn
"\033[1;33m**\033[00m"
+ ewarn "Do not use debug in production!"
+ ewarn
"\033[1;33m**\033[00m"
+ ewarn
+ fi
+}
+
+src_prepare() {
+ # Unconditionally get rid of the bundled jemalloc and mbedTLS
+ rm -rf "${S}"/deps
+}
+
+src_configure() {
+ local myconf=""
+
+ use elibc_uclibc && myconf+=" --uclib-mode"
+ use elibc_musl && myconf+=" --musl-mode"
+
+ #use jemalloc || myconf+=" --malloc-libc"
+ myconf+=" --malloc-libc"
+
+ if use debug; then
+ myconf+=" --debug --trace"
+
[gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/
commit: c722ee5b3b5d4b4ec54dbc6a8c30f1ed494a77bd Author: Lars Wendler gentoo org> AuthorDate: Thu Sep 3 07:18:12 2015 + Commit: Lars Wendler gentoo org> CommitDate: Thu Sep 3 07:18:12 2015 + URL:https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=c722ee5b seamonkey: Move from release candidate to final release. www-client/seamonkey/Manifest | 52 +++--- ...nkey-2.35_pre3.ebuild => seamonkey-2.35.ebuild} | 0 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest index 231cfac..80efdea 100644 --- a/www-client/seamonkey/Manifest +++ b/www-client/seamonkey/Manifest @@ -29,6 +29,32 @@ DIST seamonkey-2.33.1-uk.xpi 874106 SHA256 5f40259490b909023b318fa633fb8f549071c DIST seamonkey-2.33.1-zh-CN.xpi 834422 SHA256 1e07dbcfc5739a5e76b13b07327ce81a753e7bfe503a3abd9d5f656d12f918aa SHA512 16a1d1ad2993e0f89027a2fad52f09abe083d283d57a7e9d5f2eddaa3f4ac9f331f179da2b3a4e5d3d437b375cee579cb2c5bafe7a2d49c8e7e898dbb43963a5 WHIRLPOOL 36eb19c03ff8a21b86e23c372c382f6ad63165c658b9fb3152175fa1941562ba8ed41f05c51cd6e36e7fd35f1bf6d691a3ba7f0a4f08c56eead0a783e6ff6cf0 DIST seamonkey-2.33.1-zh-TW.xpi 860687 SHA256 b0c382d9fc410b7a2c4219511c461ca0cd9df14f5a8ac799cfa46d236af5d636 SHA512 51a4955f8cd7af954bd123388aa130c0ee705bf75311dac520b7b87b1b409b1e2e1093b1e5a75e63ba0a3168eb8ad6f204c935cf421eb89b3ce7529fd659b89f WHIRLPOOL df6ddde364b4276c9f6c78a462a79af9b70cd1c755a517b914b33b05260defb62beb54f74a813226c025d83bf0a87bcdbda209b98b9f8b8a7be4c713f85e7c28 DIST seamonkey-2.33.1.source.tar.bz2 203015246 SHA256 b29779cfd4b334ed21a8265ec13327aa7f35ef2895c38a971e41f3e63c85af08 SHA512 2fcd2833c140504a176da145b3fd519a22135c273ce8ea87d39e45a6255533e59dccb24367e3fc9b0575cfc7a7fe2b777296a067edafc83a3397d6916d9e3803 WHIRLPOOL c20f1dc667375608a94899546339c22134d09f74f3eae55b048ac21a6c024acbf7998d437d137963cf231b9ee07e6e69bc7b34ca7267a4ab3d3f6c51d09c4840 +DIST seamonkey-2.35-be.xpi 844271 SHA256 c1043f743a353dfb46db8f524249c808183e89f4f0f7a6181f9d5304d545f694 SHA512 2683a9e5858680a37b152c77fc15964d9b342e2d2a0fc409968b6cf35758f2bf30b3339dcd5c860ef95c56ed85c224383f95efc3d14999cd0a3e4a396c7c4644 WHIRLPOOL f3f69369b0e225cdbb8fc1ac35e4e2295ed1778df7cabd3c9f4f566b758ee6f7dc2f922e422b5b5175bc2ff2ecc15769e535810a90435d15f57f7b22217eb1bf +DIST seamonkey-2.35-ca.xpi 835414 SHA256 6b6bc56a6f780f18a8736a554fcec9b042ff8c3a4ecbef9d192d3ad6a67ed150 SHA512 7dd90e4d3124749971c66c5aa49c4a7ba2fa3813df49526d8f42083b0b6b712362005d3e7332a4d74b053360d56beb22f922e6917471f42e81386b7cc5d9b6d0 WHIRLPOOL 8aa4bc9e1d662c3488fe27b490b4bc42536931a82340b5b133b9886efd10836b64da3c7f253cfd83e561f0d9b2ed03cae922a836c9bb0f927a4c28dabd1de64f +DIST seamonkey-2.35-cs.xpi 830496 SHA256 f1ac05c2f4e123a12697f094c8c336c887f573640e766b63744dc98cea7c224a SHA512 e7b32870956654f59905e31bfed47e54c1c81eef42b33150b9d697319c9aea54955b425a1d0f8899241a3b1747b7561414b17e8ae3bc1825d9a9eb88454ccdd4 WHIRLPOOL ba14199497b61ede105e5f7eebd28da0c6804ac1e67c770aebbfc694e0f046a064b43c9a2ce234f1b26bee6fb35daa820f111c417be14169ae61a63eaf769222 +DIST seamonkey-2.35-de.xpi 838035 SHA256 5a9f9a542f8e815c4263f04e107e489dc6d8bae6b6464cd5f7af2966e9513acf SHA512 ffcd97d184df2d7b0b25bf8bf04055585826675100048d9ccdc453c67030cd20ed5a9adefed79388fc4e507e359233e27d31e6a6bd000b8e62496538da479e60 WHIRLPOOL 8b271aabdae9d8be8f3ab103d489fe5902c0f38caff003c5fc6d9e3840c106e3176ae47f2b207212d2ccd7b68dc52c64f63ac1f3e8f37d4bb3b0b2434591aeed +DIST seamonkey-2.35-en-GB.xpi 804302 SHA256 e3db5141e431ea31f7d1f1d5a01aa9e0499d49bda0828b4ebfc77802ee365771 SHA512 eb67fa8ff2a1fa2f3649214e29daf56c866ee1ad26809229044ca3a1a9ea5493dbd7c00d3de09ea3c3e46e468ea3e5ffa8878b4d59e8b3aa3be0a67458694b94 WHIRLPOOL e52c054da0f9cacc5565bfeeb84a3cb6a16f09410b56f601920cc3f7e9e8d85c36d8fe94597a383f4cca13a2a71d4347a25b828ece1b19f14b99b649a5d7ec2b +DIST seamonkey-2.35-es-AR.xpi 852042 SHA256 74c6c241aa7a1395435539b8969e0e9c4f3fcf957f7c6e8e73f5f61fae211575 SHA512 f055a4b759e8a5ab7f46fc5f263b7a351aba8f7249a36e6a3b0922aceb5ce1c40913c2a8dbd10cfb2b19231a8b9f85d6c4fdaa9d7d5a61827e9d8f2a9405b9a2 WHIRLPOOL 5599ffaed17c1630887cd1f5ff3ee4d8e46b886e6a360acdf546f9382810eae41017522175eb67a27708898d55eb048e9c9506fca2ff23dedc160e85b7b3186b +DIST seamonkey-2.35-es-ES.xpi 830454 SHA256 c242cfb3406ad6048d7f855e22afdb58bd4d6f8d918eb2e96ddfcf64a0b445ad SHA512 bf03b245974264e8c9fa64c679b68b4f2a67b3bab76c07b7cb1478bf8fa071110fe129bd6f42bb878105c1c017672f5c6c2076f0a39bdf5500f5ba3adfe62fa2 WHIRLPOOL fe32e889f67a0e531a28451928cbea897d5b272a62943c9d6b8d39d239857553aaae31d428399d9e309dd8643fe243944cc0cc11c554bbc8a9346d2e5b417910 +DIST seamonkey-2.35-fi.xpi 802373 SHA256 92b7764676bc98f88ec4d9014f4f60577e78ae804ad610a5d6fe1493b554e555 SHA512 4938a8285170f5ebfaa46859aaa8a43e9efc49180a8ae3b79b189d94b660868212a34a83090043ee59b89ef89e10b608390db3692739fc64c95c0af518035b10 WHIRLPOOL 739252f6ac6964e2a7cea6753e7917b
[gentoo-commits] repo/gentoo:master commit in: dev-python/netaddr/
commit: 971b2599e1756c163d38b5f73b8fd796fb05c6df
Author: Justin Lecher gentoo org>
AuthorDate: Thu Sep 3 07:28:04 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Thu Sep 3 07:28:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=971b2599
dev-python/netaddr: Add RTD to HOMEPAGE
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher gentoo.org>
dev-python/netaddr/netaddr-0.7.17.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/netaddr/netaddr-0.7.17.ebuild
b/dev-python/netaddr/netaddr-0.7.17.ebuild
index 5639cdd..d043d03 100644
--- a/dev-python/netaddr/netaddr-0.7.17.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.17.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 python3_{3,4} )
inherit distutils-r1
DESCRIPTION="Network address representation and manipulation library"
-HOMEPAGE="https://github.com/drkjam/netaddr
https://pypi.python.org/pypi/netaddr";
+HOMEPAGE="https://github.com/drkjam/netaddr
https://pypi.python.org/pypi/netaddr https://netaddr.readthedocs.org";
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
[gentoo-commits] repo/gentoo:master commit in: net-misc/nxplayer/
commit: 2d7ca7324ff83eaf64ee7f4498ebb186c2f0d99a
Author: Bernard Cafarelli gentoo org>
AuthorDate: Thu Sep 3 07:57:10 2015 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Thu Sep 3 08:02:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d7ca732
net-misc/nxplayer: version bump
Package-Manager: portage-2.2.20.1
net-misc/nxplayer/Manifest| 4 ++--
.../nxplayer/{nxplayer-4.6.3.13.ebuild => nxplayer-4.6.16.1.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-misc/nxplayer/Manifest b/net-misc/nxplayer/Manifest
index af34d68..9f5fabf 100644
--- a/net-misc/nxplayer/Manifest
+++ b/net-misc/nxplayer/Manifest
@@ -1,4 +1,4 @@
DIST nomachine-enterprise-client_4.6.12_7_i686.tar.gz 45504 SHA256
066cab4676426c9631c281ab38111d41326592c63ce3c189b4e93d3f05c89073 SHA512
04bf0112688a969ec1a68c1a083bdc3f365fbf439a1d9555cb2b7edc9032981ee9c37d659893c0acc4548f892f2a18eba980f450ed44f581f7c532f485f31649
WHIRLPOOL
a6513bd5b731d889ad311d77cc9af9e5ca3c727f9694c0fc7f8b03a111b63d9690f1981c9285bee25815da025d89a850943a38a008a301f23c8fd07d4deec1bd
DIST nomachine-enterprise-client_4.6.12_7_x86_64.tar.gz 24170379 SHA256
2dc1ad80a2ad829346009ad4f8aa9d3d3b097b70d8f929100fb79e01fcb4b403 SHA512
fbbc9dac184b14a025807d82aa4d4e28654f2e1aed2f76adb83885719a4ebf0b91f68befb798662bf55e9dacbcf3db2e533d2901e5bce2e094f486dbb4df61e7
WHIRLPOOL
63449a1c130dce99936748048f6b84c14122000edb3f2da6f5daa46e67d555036341aa180c446af76363188490e3951e5d2d3bb63d3d7ce1e58a2db5548f5058
-DIST nomachine-enterprise-client_4.6.3_13_i686.tar.gz 45394 SHA256
f7b364e338c74a7d1f56c45d0f56d4f91f1e3639915a51d38a6bf322ccdf6ab8 SHA512
366f007270a13b12ad47c8d1333f29c9632dfa2cab9f50317657470457d7ea842eab650258f77f0d7b44953d4e6b8d54342d6ba1f459c4a06ed17d8b62dea4ef
WHIRLPOOL
2e7d5265a2a687fe151f70197331bd9878b4a0cc5e32bd18f91258cf626c68320e63b7b4ae9ac3c924845b4b7a4c42ad2b436d735ea1d490259756054c1ba421
-DIST nomachine-enterprise-client_4.6.3_13_x86_64.tar.gz 24158842 SHA256
3b15e058bcdfa25459bb01be4b81fd84e48b94f07a3e5cb13b7b3a840903cf8e SHA512
2b11ed7c6a4bef0b9f8b549f61de7c79402a6e848ebd0dd3e7b6096f4ae3307779f0d3b2e1e114bddaba6d27f4c395ca7a523ac7e61aae8e99d0c582d45eb642
WHIRLPOOL
05fd422a2b9695c681f300372045ffd2374069b95ea9d7ac29b9279ed5322f37f49503a203f7470d5468f11e8b2f879e940d8cb105d4a45d59f128b9f1a67720
+DIST nomachine-enterprise-client_4.6.16_1_i686.tar.gz 23265721 SHA256
57c9f8516f93194dd5df00e3ce531c0fc6a23fbe200b46b716aad8518aece6fc SHA512
3a60deafdf6798f1386c2bdc61fbde66abc252b419ecd7cd8822b7e3af08e43c75d186fcd4d4a8e19452502f42aedf7318adb6f8b91af8b5b25c7522ed204ff6
WHIRLPOOL
8d54ede57c7dd17054d776255a3783e1dd40b2f436ea77cb8215bf08031df05e8dfcd6d61937b9da800dcbf3733ef6ee3b50872d2e5b950ace869ca72910e3ad
+DIST nomachine-enterprise-client_4.6.16_1_x86_64.tar.gz 24175782 SHA256
9e3cff9a1ab3f7c2fcae47e9aae9af95a8f981db02d15060355aefa76150af68 SHA512
9658f52127a5ca1702772492b1761418b923243b98bb4bb7c86bdd89a7f413732e0f5660f8392630b082d79856041f2ae91f2cc0cb3a24fa5d11dc688d1178fc
WHIRLPOOL
9690e2b21d9653a83a2b2c5490359557efcf739c34ef0a49784f346bf18335f287aca7908f83ff2085b51b05b1330663db5d55b33fdc762d5e430cf6d2d4e314
diff --git a/net-misc/nxplayer/nxplayer-4.6.3.13.ebuild
b/net-misc/nxplayer/nxplayer-4.6.16.1.ebuild
similarity index 100%
rename from net-misc/nxplayer/nxplayer-4.6.3.13.ebuild
rename to net-misc/nxplayer/nxplayer-4.6.16.1.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-gfx/argyllcms/
commit: 19315b4cf30689405f0347825d45d0b4de674625
Author: Bernard Cafarelli gentoo org>
AuthorDate: Thu Sep 3 08:15:39 2015 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Thu Sep 3 08:15:39 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19315b4c
media-gfx/argyllcms: version bump
Includes support for some new hardware, bug fixes
Package-Manager: portage-2.2.20.1
media-gfx/argyllcms/Manifest | 1 +
media-gfx/argyllcms/argyllcms-1.8.0.ebuild | 91 ++
2 files changed, 92 insertions(+)
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index 16e4087..9d94081 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -3,3 +3,4 @@ DIST Argyll_V1.5.1_src.zip 9693168 SHA256
7c65055e577da5a3344b3949e52c3e66fe6339
DIST Argyll_V1.6.2_src.zip 10291838 SHA256
c21591d5615a584df438ecbfe7858fde571f6066e56da436c541d08ca899ac9f SHA512
98484eb7985482c132532c2aedb24afeb20576a6417c89718d58e5e35e36bd4feb270aa7ea8c86b31dc218c82d99de3500c47346c75159a79de9df57d2019fcd
WHIRLPOOL
fbc4b766bd45d47b33f56b8662c7681c251aab0c978ff71f3079b83f9eeb8052725b77446035ce91589f11553283f84b43f24602e3b4127bc1b5f37672d3
DIST Argyll_V1.6.3_src.zip 10338488 SHA256
188beaa03dd2459403415023f8f8f9aab362bf3062a9822b3622dde6902e4b84 SHA512
7c350c73492d7e2e27354814cfcb172bf1e4bb6ee8f3f71f2003a7d44ed4be9890a6c80d6a69228495645be11a327c0f7c2ab68d6f6621dd938744a1cd7ebe95
WHIRLPOOL
a854ebcca1950f3e654ae85fff3189bae17c511c26e2f3dd8104d9b55ddb83022659276fae201899f51a2a27b00c1cf98f157261e50d0fd48f1a8044923e11c6
DIST Argyll_V1.7.0_src.zip 13935712 SHA256
dac51cf5d8f6d04bb02f2f5b119fa0e8b773a010e6377116768b082ef018f663 SHA512
644683c8a73d36583d607b5d51c543dca8f1e3fb3db8138a164f9ed7f994df7739ee7d810b7136a7cf0eba7b54fe53b35ffbdd4e6915ec20b271325119ce369c
WHIRLPOOL
e08c6e311856716ee6b49e37c583d8d4275629fb746f018e0d7c768d4c907644dc60545ff2c709217988c668b198dfc95396af3fdf0ccd40d320514854b1c087
+DIST Argyll_V1.8.0_src.zip 13931190 SHA256
02440060b224bf8e42bd7eabe0c857e1311546839391d94bb250dda60e4db13b SHA512
959a581aaf3514a130cae3aa133c385591b53d11e5ee6bb11349ee8614f392baa5f5799ede4d10dda8a3c182fc69a186a5a1738070649acdfb9987aa52f83976
WHIRLPOOL
6b43e3ecff4cde12fa1d6fe51f0a9612019ac1f452eed66e32ce8a834f127ee84119fdbb436cf1266e4e586f534acbf74df1102215d311d69a7f4f723d77a286
diff --git a/media-gfx/argyllcms/argyllcms-1.8.0.ebuild
b/media-gfx/argyllcms/argyllcms-1.8.0.ebuild
new file mode 100644
index 000..c59a59a
--- /dev/null
+++ b/media-gfx/argyllcms/argyllcms-1.8.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit base flag-o-matic multiprocessing toolchain-funcs udev
+
+MY_P="Argyll_V${PV}"
+
+DESCRIPTION="Open source, ICC compatible color management system"
+HOMEPAGE="http://www.argyllcms.com/";
+SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip";
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="doc"
+
+RDEPEND="
+ media-libs/tiff:0
+ sys-libs/zlib
+ virtual/jpeg:0
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libXext
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXxf86vm
+ x11-libs/libXScrnSaver"
+DEPEND="${RDEPEND}
+ app-arch/unzip
+ dev-util/ftjam"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ )
+
+src_compile() {
+ # Make it respect LDFLAGS
+ echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
+
+ # Evil hack to get --as-needed working. The build system unfortunately
lists all
+ # the shared libraries by default on the command line _before_ the
object to be built...
+ echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr
-lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
+
+ append-cflags -DUNIX -D_THREAD_SAFE
+
+ sed \
+ -e 's:CCFLAGS:CFLAGS:g' \
+ -e "s:ar rusc:$(tc-getAR) rusc:g" \
+ -i Jambase || die
+
+ tc-export CC RANLIB
+
+ jam -dx -fJambase "-j$(makeopts_jobs)" || die
+}
+
+src_install() {
+ jam -dx -fJambase install || die
+
+ rm bin/License.txt || die
+
+ pushd bin > /dev/null
+ local binname
+ for binname in * ; do
+ newbin ${binname} argyll-${binname}
+ done
+ popd > /dev/null
+
+ use doc && dohtml doc/*
+
+ dodoc log.txt Readme.txt ttbd.txt notes.txt
+
+ insinto /usr/share/${PN}
+ doins -r ref
+
+ udev_dorules usb/55-Argyll.rules
+}
+
+pkg_postinst() {
+ elog "If you have a Spyder2 you need to extract the firmware"
+ elog "from the CVSpyder.dll of the windows driver package"
+ elog "and store it as /usr/share/color/spyd2PLD.bin"
+ echo
+ elog "For further info on setting up instrument access read"
+ elog "http://www.argyllcms.
[gentoo-commits] repo/gentoo:master commit in: x11-libs/gdk-pixbuf/
commit: 6b766a09f68d43992bb2ca3f9919bf111d7ef994 Author: Agostino Sarubbo gentoo org> AuthorDate: Thu Sep 3 08:23:59 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu Sep 3 08:23:59 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b766a09 x11-libs/gdk-pixbuf: amd64 stable wrt bug #556314 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="amd64" x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild index b01f16e..7e1e092 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtk.org/"; LICENSE="LGPL-2+" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+X debug +introspection jpeg jpeg2k tiff test" COMMON_DEPEND="
[gentoo-commits] repo/gentoo:master commit in: www-client/firefox-bin/
commit: e5427955ff009484c0f3aa4bb155ccc7ad43b3ee
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Sep 3 08:23:50 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Sep 3 08:23:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5427955
www-client/firefox-bin: amd64 stable wrt bug #559186
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"
www-client/firefox-bin/firefox-bin-38.2.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-client/firefox-bin/firefox-bin-38.2.1.ebuild
b/www-client/firefox-bin/firefox-bin-38.2.1.ebuild
index 76b8401..6598a28 100644
--- a/www-client/firefox-bin/firefox-bin-38.2.1.ebuild
+++ b/www-client/firefox-bin/firefox-bin-38.2.1.ebuild
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI}
HOMEPAGE="http://www.mozilla.com/firefox";
RESTRICT="strip mirror"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
SLOT="0"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
IUSE="selinux startup-notification"
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/nova/
commit: 705fd913079585c19d28bb0b876d470dc21f28a2
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Sep 3 08:22:55 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Sep 3 08:22:55 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=705fd913
sys-cluster/nova: amd64 stable wrt bug #559376
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"
sys-cluster/nova/nova-2015.1.1-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/nova/nova-2015.1.1-r3.ebuild
b/sys-cluster/nova/nova-2015.1.1-r3.ebuild
index fadb780..0cfba33 100644
--- a/sys-cluster/nova/nova-2015.1.1-r3.ebuild
+++ b/sys-cluster/nova/nova-2015.1.1-r3.ebuild
@@ -13,7 +13,7 @@
SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz";
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="+compute compute-only iscsi +kvm +memcached mysql +novncproxy
openvswitch postgres +rabbitmq sqlite test xen"
REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
compute-only? ( compute
!rabbitmq !memcached !mysql !postgres !sqlite )
[gentoo-commits] repo/gentoo:master commit in: www-client/firefox/
commit: fd56c127706e8d67facaff4b7548f43f45eaca7b Author: Agostino Sarubbo gentoo org> AuthorDate: Thu Sep 3 08:23:45 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu Sep 3 08:23:45 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd56c127 www-client/firefox: amd64 stable wrt bug #559186 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="amd64" www-client/firefox/firefox-38.2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www-client/firefox/firefox-38.2.1.ebuild b/www-client/firefox/firefox-38.2.1.ebuild index c47f43f..c34ad39 100644 --- a/www-client/firefox/firefox-38.2.1.ebuild +++ b/www-client/firefox/firefox-38.2.1.ebuild @@ -38,7 +38,7 @@ inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6 DESCRIPTION="Firefox Web Browser" HOMEPAGE="http://www.mozilla.com/firefox"; -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" SLOT="0" LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
[gentoo-commits] repo/gentoo:master commit in: net-libs/polarssl/
commit: 5613c32014df1e7e7540ee47aec1e42cf3d6d172
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Sep 3 08:23:10 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Sep 3 08:23:10 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5613c320
net-libs/polarssl: amd64 stable wrt bug #528130
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"
net-libs/polarssl/polarssl-1.3.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/polarssl/polarssl-1.3.9.ebuild
b/net-libs/polarssl/polarssl-1.3.9.ebuild
index e6a1408..e8c6460 100644
--- a/net-libs/polarssl/polarssl-1.3.9.ebuild
+++ b/net-libs/polarssl/polarssl-1.3.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://polarssl.org/download/${P}-gpl.tgz";
LICENSE="GPL-2"
SLOT="0/7"
-KEYWORDS="alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86
~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86
~amd64-fbsd ~x86-fbsd"
IUSE="doc havege programs cpu_flags_x86_sse2 static-libs test threads zlib"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: www-client/chromium/
commit: 93c06c55431efa199c9f5561b62b443eab7cc873
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Sep 3 08:21:35 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Sep 3 08:21:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93c06c55
www-client/chromium: amd64 stable wrt bug #559384
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"
www-client/chromium/chromium-45.0.2454.85.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-client/chromium/chromium-45.0.2454.85.ebuild
b/www-client/chromium/chromium-45.0.2454.85.ebuild
index d521ed9..ca5083e 100644
--- a/www-client/chromium/chromium-45.0.2454.85.ebuild
+++ b/www-client/chromium/chromium-45.0.2454.85.ebuild
@@ -18,7 +18,7 @@
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD hotwording? ( no-source-code )"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
IUSE="cups gnome gnome-keyring hidpi hotwording kerberos neon pic
+proprietary-codecs pulseaudio selinux +tcmalloc"
RESTRICT="proprietary-codecs? ( bindist )"
[gentoo-commits] repo/gentoo:master commit in: www-client/chromium/
commit: 33fe9f9de2f291c899afdd64d0cb9bb94cb754bc
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Sep 3 08:25:09 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Sep 3 08:25:09 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33fe9f9d
www-client/chromium: x86 stable wrt bug #559384
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"
www-client/chromium/chromium-45.0.2454.85.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-client/chromium/chromium-45.0.2454.85.ebuild
b/www-client/chromium/chromium-45.0.2454.85.ebuild
index ca5083e..70baec6 100644
--- a/www-client/chromium/chromium-45.0.2454.85.ebuild
+++ b/www-client/chromium/chromium-45.0.2454.85.ebuild
@@ -18,7 +18,7 @@
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD hotwording? ( no-source-code )"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="cups gnome gnome-keyring hidpi hotwording kerberos neon pic
+proprietary-codecs pulseaudio selinux +tcmalloc"
RESTRICT="proprietary-codecs? ( bindist )"
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/nova/
commit: e9ae7a865cc15adf0c6bbe37a3defdd96a41b5ec
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Sep 3 08:25:16 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Sep 3 08:25:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9ae7a86
sys-cluster/nova: x86 stable wrt bug #559376
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"
sys-cluster/nova/nova-2015.1.1-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/nova/nova-2015.1.1-r3.ebuild
b/sys-cluster/nova/nova-2015.1.1-r3.ebuild
index 0cfba33..e5f49c9 100644
--- a/sys-cluster/nova/nova-2015.1.1-r3.ebuild
+++ b/sys-cluster/nova/nova-2015.1.1-r3.ebuild
@@ -13,7 +13,7 @@
SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz";
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+compute compute-only iscsi +kvm +memcached mysql +novncproxy
openvswitch postgres +rabbitmq sqlite test xen"
REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
compute-only? ( compute
!rabbitmq !memcached !mysql !postgres !sqlite )
[gentoo-commits] repo/gentoo:master commit in: x11-libs/gdk-pixbuf/
commit: f102cbf01ac326719a362f0f7944243f2310508d Author: Agostino Sarubbo gentoo org> AuthorDate: Thu Sep 3 08:25:40 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu Sep 3 08:25:40 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f102cbf0 x11-libs/gdk-pixbuf: x86 stable wrt bug #556314 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="x86" x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild index 7e1e092..192d7fb 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtk.org/"; LICENSE="LGPL-2+" SLOT="2" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+X debug +introspection jpeg jpeg2k tiff test" COMMON_DEPEND="
[gentoo-commits] repo/gentoo:master commit in: www-client/firefox-bin/
commit: 6ed48de67dfd448398893fa2ef5c44cb4a179557
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Sep 3 08:25:34 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Sep 3 08:25:34 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ed48de6
www-client/firefox-bin: x86 stable wrt bug #559186
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"
www-client/firefox-bin/firefox-bin-38.2.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-client/firefox-bin/firefox-bin-38.2.1.ebuild
b/www-client/firefox-bin/firefox-bin-38.2.1.ebuild
index 6598a28..218bcb6 100644
--- a/www-client/firefox-bin/firefox-bin-38.2.1.ebuild
+++ b/www-client/firefox-bin/firefox-bin-38.2.1.ebuild
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI}
HOMEPAGE="http://www.mozilla.com/firefox";
RESTRICT="strip mirror"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
SLOT="0"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
IUSE="selinux startup-notification"
[gentoo-commits] repo/gentoo:master commit in: www-client/firefox/
commit: c52c5879dcc56c459085730bf8de6796d5200c4f Author: Agostino Sarubbo gentoo org> AuthorDate: Thu Sep 3 08:25:29 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu Sep 3 08:25:29 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c52c5879 www-client/firefox: x86 stable wrt bug #559186 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="x86" www-client/firefox/firefox-38.2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www-client/firefox/firefox-38.2.1.ebuild b/www-client/firefox/firefox-38.2.1.ebuild index c34ad39..1703a33 100644 --- a/www-client/firefox/firefox-38.2.1.ebuild +++ b/www-client/firefox/firefox-38.2.1.ebuild @@ -38,7 +38,7 @@ inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6 DESCRIPTION="Firefox Web Browser" HOMEPAGE="http://www.mozilla.com/firefox"; -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" SLOT="0" LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
[gentoo-commits] repo/gentoo:master commit in: net-libs/polarssl/
commit: 120a35fdc2baaa620cedb1467f8a209f8e49
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Sep 3 08:25:21 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Sep 3 08:25:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=120a35fd
net-libs/polarssl: x86 stable wrt bug #528130
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"
net-libs/polarssl/polarssl-1.3.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/polarssl/polarssl-1.3.9.ebuild
b/net-libs/polarssl/polarssl-1.3.9.ebuild
index e8c6460..53e1121 100644
--- a/net-libs/polarssl/polarssl-1.3.9.ebuild
+++ b/net-libs/polarssl/polarssl-1.3.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://polarssl.org/download/${P}-gpl.tgz";
LICENSE="GPL-2"
SLOT="0/7"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86
~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86
~amd64-fbsd ~x86-fbsd"
IUSE="doc havege programs cpu_flags_x86_sse2 static-libs test threads zlib"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmbattery/
commit: 6a027881c0a971bca7603cdd4916c14289bf8ed7
Author: Bernard Cafarelli gentoo org>
AuthorDate: Thu Sep 3 08:45:24 2015 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Thu Sep 3 08:45:24 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a027881
x11-plugins/wmbattery: version bump
Package-Manager: portage-2.2.20.1
x11-plugins/wmbattery/Manifest | 1 +
x11-plugins/wmbattery/wmbattery-2.50.ebuild | 36 +
2 files changed, 37 insertions(+)
diff --git a/x11-plugins/wmbattery/Manifest b/x11-plugins/wmbattery/Manifest
index f50acf6..e7c3841 100644
--- a/x11-plugins/wmbattery/Manifest
+++ b/x11-plugins/wmbattery/Manifest
@@ -1,3 +1,4 @@
DIST wmbattery-2.48.tar.gz 41301 SHA256
874d62c209efd98471b72ef2756d608a957d5106cbf92a6761985a934008661a SHA512
d1ce3824557d34104087abf77262d46ce603d204332eb585c2fec3777abaa4c8d796787fd8f9b8b9c9b583d01f561f98f57dcdb21db22e9d92b27905627053b3
WHIRLPOOL
cf113d45f6232031d72a44dbd6cda3cf6db8dabba91d525943139397058a7070149daf29a41e3f434643f09953351c0e05414f4592f0e731da5261fa2ef616d3
DIST wmbattery-2.49.tar.gz 40810 SHA256
3fdb024179409056c14c6906e218736d7464824ad102721c53d6450d5535935f SHA512
4f146d6bb9374c813568b0b1fc12a585efac317ea6f144a750437115f3b09ffe46cd2d3b2405007456a5eea254ce634d8de445195e56cfb7be11a042a1ec
WHIRLPOOL
7797716bed44c4fd631a6722d93ee5d53dbd9771e7db15336328e8a2fc7c07a6fc3452a94c62ce0a54e4275f4474ebb1cebad1ce83202ccc019a257e6664ed00
+DIST wmbattery-2.50.tar.gz 40938 SHA256
6179f33911ae642835c9ec456b422d5c72ffb74d7fcca2a70fa5f23929fa04d5 SHA512
f96b98d2819a9ecf189b9ebc60c107abc6715cf76bb73c98f1d3649dd2ef6112e052559f13fc5620ec7d71466f2e4d6a5e7e86b0f5f0675e02d6e038a9411794
WHIRLPOOL
6735904c44a2e5c67998c0b11ea422d8a9a14956739f7b9eefe75de1f1a7fe9cf8b22dd7684756520c0c223cfdd93cd548f3ef5013d52941cf3c9a698c48e0bc
DIST wmbattery_2.44.tar.gz 39278 SHA256
aa0a1312922ba4f0abca5f2e8abbf285363bf4a1c8862d89fe2921e74c832cae SHA512
ce6eb3a7b9028d8923d920fe831203a9bd0c2cd3a02df0cf5074296d55dcace9750edfd8237faa9397003ed97b0305ef8e91d029261593a54269c17d0b7b3717
WHIRLPOOL
cae6d6027f8bafa1966ab6b7d377fa817e767e23726e907932f7da74e46a081729568df069df5d1f01b7f7e06740bfcb8cab90ac4ba10e93b3e09fe04cba5e1a
diff --git a/x11-plugins/wmbattery/wmbattery-2.50.ebuild
b/x11-plugins/wmbattery/wmbattery-2.50.ebuild
new file mode 100644
index 000..6c156a95
--- /dev/null
+++ b/x11-plugins/wmbattery/wmbattery-2.50.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools
+
+DESCRIPTION="A dockable app to report APM, ACPI, or SPIC battery status"
+HOMEPAGE="http://windowmaker.org/dockapps/?name=wmbattery";
+# Grab from http://windowmaker.org/dockapps/?download=${P}.tar.gz
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc -sparc ~x86"
+IUSE="apm +upower"
+
+RDEPEND="apm? ( sys-apps/apmd )
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXpm
+ upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( ChangeLog README TODO )
+
+src_prepare() {
+ sed -i \
+ -e '/^icondir/s:icons:pixmaps:' \
+ autoconf/makeinfo.in || die
+
+ use upower || { sed -i -e 's:USE_UPOWER = 1:#&:' autoconf/makeinfo.in
|| die; }
+
+ eautoreconf
+}
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/
commit: f847ec84e53e7929d16a19667fbc47e149ac7a10
Author: Ultrabug gentoo org>
AuthorDate: Thu Sep 3 08:46:19 2015 +
Commit: Alexys Jacob gentoo org>
CommitDate: Thu Sep 3 08:46:42 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f847ec84
sys-cluster/glusterfs: change elog upgrade link thx to Bernd Feige,eige, fix
#559396
Package-Manager: portage-2.2.20.1
sys-cluster/glusterfs/glusterfs-3.6.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild
b/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild
index 5015ae8..c159fda 100644
--- a/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild
@@ -173,7 +173,7 @@ pkg_postinst() {
elog
elog "If you are upgrading from a previous version of ${PN}, please
read:"
- elog "
http://www.gluster.org/community/documentation/index.php/Upgrade_to_3.5";
+ elog "
http://www.gluster.org/community/documentation/index.php/Upgrade_to_3.6";
use emacs && elisp-site-regen
}
[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/
commit: df55bfe44b585e517e5ee6d0573c24ae7ac8baba
Author: James Le Cuirot gentoo org>
AuthorDate: Thu Sep 3 08:57:21 2015 +
Commit: James Le Cuirot gentoo org>
CommitDate: Thu Sep 3 08:57:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df55bfe4
app-admin/collectd: Use the Java eclasses wrt but #558310
Java team needs to remove java-config-wrapper, which this erroneously
depends on. The existing ebuild does not make use of the Java
eclasses, which can lead to problems. I have:
* Made use of java-pkg-opt-2.
* Added a DEPEND on virtual/jdk.
* Used sed against the Java Makefile.am to set proper javac flags.
* Used the eclasses to properly set JAVA_HOME.
* Registered the installed jars so that Gentoo metadata is created.
Package-Manager: portage-2.2.20.1
app-admin/collectd/collectd-5.4.1-r2.ebuild | 388
1 file changed, 388 insertions(+)
diff --git a/app-admin/collectd/collectd-5.4.1-r2.ebuild
b/app-admin/collectd/collectd-5.4.1-r2.ebuild
new file mode 100644
index 000..5b6a955
--- /dev/null
+++ b/app-admin/collectd/collectd-5.4.1-r2.ebuild
@@ -0,0 +1,388 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GENTOO_DEPEND_ON_PERL="no"
+JAVA_PKG_OPT_USE="collectd_plugins_java"
+# XXX: 5.4.1-r0 stated 2* but it builds fine against 3.4
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools base eutils java-pkg-opt-2 linux-info multilib perl-app
python-single-r1 systemd user
+
+DESCRIPTION="A a daemon which collects system statistic and provides
mechanisms to store the values"
+
+HOMEPAGE="http://collectd.org";
+SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl selinux
static-libs"
+
+# The plugin lists have to follow here since they extend IUSE
+
+# Plugins that to my knowledge cannot be supported (eg. dependencies not in
gentoo)
+COLLECTD_IMPOSSIBLE_PLUGINS="aquaero mic netapp pinba sigrok xmms"
+
+# Plugins that still need some work
+COLLECTD_UNTESTED_PLUGINS="amqp apple_sensors genericjmx ipvs lpar modbus redis
+ tape write_redis zfs_arc"
+
+# Plugins that have been (compile) tested and can be enabled via
COLLECTD_PLUGINS
+COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent battery bind cgroups
+ conntrack contextswitch cpu cpufreq csv curl curl_json curl_xml dbi df
disk dns
+ email entropy ethstat exec filecount fscache gmond hddtemp interface
ipmi
+ iptables irq java libvirt load logfile lvm madwifi match_empty_counter
+ match_hashed match_regex match_timediff match_value mbmon md memcachec
memcached
+ memory multimeter mysql netlink network network nfs nginx notify_desktop
+ notify_email ntpd numa nut olsrd onewire openvpn oracle perl perl ping
postgresql
+ powerdns processes protocols python python routeros rrdcached rrdcached
rrdtool
+ sensors serial snmp statsd swap syslog table tail target_notification
+ target_replace target_scale target_set tcpconns teamspeak2 ted thermal
threshold
+ tokyotyrant unixsock uptime users uuid varnish vmem vserver wireless
+ write_graphite write_http write_mongodb"
+
+COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS}
${COLLECTD_UNTESTED_PLUGINS}"
+
+COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
+
+for plugin in ${COLLECTD_ALL_PLUGINS}; do
+ IUSE="${IUSE} collectd_plugins_${plugin}"
+done
+unset plugin
+
+# Now come the dependencies.
+
+COMMON_DEPEND="
+ dev-libs/libgcrypt:0
+ sys-devel/libtool
+ perl? ( dev-lang/perl:=[ithreads] )
+ collectd_plugins_apache?( net-misc/curl )
+ collectd_plugins_ascent?( net-misc/curl
dev-libs/libxml2 )
+ collectd_plugins_bind? ( dev-libs/libxml2 )
+ collectd_plugins_curl? ( net-misc/curl )
+ collectd_plugins_curl_json? ( net-misc/curl dev-libs/yajl )
+ collectd_plugins_curl_xml? ( net-misc/curl
dev-libs/libxml2 )
+ collectd_plugins_dbi? ( dev-db/libdbi )
+ collectd_plugins_dns? ( net-libs/libpcap )
+ collectd_plugins_gmond? ( sys-cluster/ganglia )
+ collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1
)
+ collectd_plugins_iptables? (
>=net-firewall/iptables-1.4.13 )
+ collectd_plugins_libvirt? ( app-emulation/libvirt
dev-libs/libxml2 )
+ collectd_plugins_lvm? ( sys-fs/lvm2 )
+ collectd_plugins_memcachec? ( dev-libs/libmemcached )
+ collectd_plugins_mysql? ( >=virtual/mysql-5.0 )
+ collectd_plugins_netlink? ( net-libs/libmnl )
+ collectd_plugins_nginx?
[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/files/, app-admin/collectd/
commit: 07c66554e03e557e567120737131cc9dce8560c8
Author: James Le Cuirot gentoo org>
AuthorDate: Thu Sep 3 09:00:14 2015 +
Commit: James Le Cuirot gentoo org>
CommitDate: Thu Sep 3 09:00:14 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07c66554
app-admin/collectd: Remove old
Package-Manager: portage-2.2.20.1
app-admin/collectd/Manifest| 1 -
app-admin/collectd/collectd-5.4.0.ebuild | 374
app-admin/collectd/collectd-5.4.1-r1.ebuild| 379 -
app-admin/collectd/collectd-5.4.1.ebuild | 372
.../collectd/files/collectd-4.10.2-libocci.patch | 20 --
.../collectd/files/collectd-4.10.2-nohal.patch | 23 --
.../collectd/files/collectd-5.1.0-libperl.patch| 30 --
app-admin/collectd/files/collectd-5.1.1-lt.patch | 32 --
8 files changed, 1231 deletions(-)
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 6698b99..3bb23b2 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1,2 +1 @@
-DIST collectd-5.4.0.tar.bz2 1506520 SHA256
90973894a1f10775d409fe23ce7bc4d89c1b7c6f4d9918b305d160605871923e SHA512
10de94d082e6bf2e0a8e2f0b179868c0f25b223c61cb8a5fda641d01f90d6332062459410d54d74a4d666f7149bb429976e9542dabeda988ed6772df9001b222
WHIRLPOOL
19db89217dfaf38fd358a60a64155e01bd68d4c8ca4fad13b97667eb3e4e4d8dbe4e9cae8568e970d8d6fe5e8dde960b06159b3026d1a554fad7a455f973ff0a
DIST collectd-5.4.1.tar.bz2 1521907 SHA256
75452129f271cb0aad28e57f12a49070618bbb7b6a9d64cf869e8766fa2f66e0 SHA512
96289f52d3d1da55c862ae9ee2f57972682d7eab87387e97efa41fb5197599e097abd71aed2fe014e26af37c9ae98471e06dd181c725849976242642ce5c9492
WHIRLPOOL
2ed85b9d6d00c4e7dc6af236b637e282f17c6c0b20c1ba3da9c12ea85c5fdea1add2e29165874c7e9620852e422282d489436a4e245b161902f8926185edec16
diff --git a/app-admin/collectd/collectd-5.4.0.ebuild
b/app-admin/collectd/collectd-5.4.0.ebuild
deleted file mode 100644
index 6e56ffb..000
--- a/app-admin/collectd/collectd-5.4.0.ebuild
+++ /dev/null
@@ -1,374 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools base eutils linux-info multilib perl-app systemd user
-
-DESCRIPTION="A a daemon which collects system statistic and provides
mechanisms to store the values"
-
-HOMEPAGE="http://collectd.org";
-SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl selinux
static-libs"
-
-# The plugin lists have to follow here since they extend IUSE
-
-# Plugins that to my knowledge cannot be supported (eg. dependencies not in
gentoo)
-COLLECTD_IMPOSSIBLE_PLUGINS="aquaero mic netapp pinba sigrok xmms"
-
-# Plugins that still need some work
-COLLECTD_UNTESTED_PLUGINS="amqp apple_sensors genericjmx ipvs lpar modbus redis
- tape write_redis zfs_arc"
-
-# Plugins that have been (compile) tested and can be enabled via
COLLECTD_PLUGINS
-COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent battery bind cgroups
- conntrack contextswitch cpu cpufreq csv curl curl_json curl_xml dbi df
disk dns
- email entropy ethstat exec filecount fscache gmond hddtemp interface
ipmi
- iptables irq java libvirt load logfile lvm madwifi match_empty_counter
- match_hashed match_regex match_timediff match_value mbmon md memcachec
memcached
- memory multimeter mysql netlink network network nfs nginx notify_desktop
- notify_email ntpd numa nut olsrd onewire openvpn oracle perl perl ping
postgresql
- powerdns processes protocols python python routeros rrdcached rrdcached
rrdtool
- sensors serial snmp statsd swap syslog table tail target_notification
- target_replace target_scale target_set tcpconns teamspeak2 ted thermal
threshold
- tokyotyrant unixsock uptime users uuid varnish vmem vserver wireless
- write_graphite write_http write_mongodb"
-
-COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS}
${COLLECTD_UNTESTED_PLUGINS}"
-
-COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
-
-for plugin in ${COLLECTD_ALL_PLUGINS}; do
- IUSE="${IUSE} collectd_plugins_${plugin}"
-done
-unset plugin
-
-# Now come the dependencies.
-
-COMMON_DEPEND="
- dev-libs/libgcrypt:0
- sys-devel/libtool
- perl? ( dev-lang/perl:=[ithreads] )
- collectd_plugins_apache?( net-misc/curl )
- collectd_plugins_ascent?( net-misc/curl
dev-libs/libxml2 )
- collectd_plugins_bind? ( dev-libs/libxml2 )
- collectd_plugins_curl? ( net-misc/curl )
- collectd_plugins_curl_json? ( net-misc/curl dev-libs/yajl )
- collectd_plugins_curl_xml? ( net-misc/curl
de
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kapidox/
commit: 340391a6bf4d93c10fb8e4479ea3e01e6bc0722c
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Sep 3 09:37:33 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Sep 3 09:37:33 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=340391a6
kde-frameworks/kapidox: enable DISTUTILS_SINGLE_IMPL since media-gfx/graphviz
is still that way.
Package-Manager: portage-2.2.20.1
kde-frameworks/kapidox/kapidox-.ebuild | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/kde-frameworks/kapidox/kapidox-.ebuild
b/kde-frameworks/kapidox/kapidox-.ebuild
index a5cca66..e633812 100644
--- a/kde-frameworks/kapidox/kapidox-.ebuild
+++ b/kde-frameworks/kapidox/kapidox-.ebuild
@@ -7,7 +7,8 @@ EAPI=5
KDE_DEBUG="false"
KDE_DOXYGEN="false"
KDE_TEST="false"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+DISTUTILS_SINGLE_IMPL="true"
+PYTHON_COMPAT=( python2_7 )
inherit kde5 distutils-r1
DESCRIPTION="Framework for building KDE API documentation in a standard format
and style"
@@ -19,8 +20,10 @@ RDEPEND="
app-doc/doxygen
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
- media-gfx/graphviz[python]
+ media-gfx/graphviz[python,${PYTHON_USEDEP}]
"
-# graphviz is currently python-single-r1 so we can't enforce a USE dep yet
-# and things will break if you try to generate a dependency diagram with a
-# different python version
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ kde5_pkg_setup
+}
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: e5e4a51c1ad737aaef386f618a34e53a7b74e7d5 Author: Bernard Cafarelli gentoo org> AuthorDate: Thu Sep 3 09:44:17 2015 + Commit: Bernard Cafarelli gentoo org> CommitDate: Thu Sep 3 09:44:17 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5e4a51c profiles: unmask sys-devel/llvm-3.7.0 profiles/package.mask | 5 - 1 file changed, 5 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 11d09b0..149ce15 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -62,11 +62,6 @@ app-emulation/kvm-kmod # last version does not compile. Bug #543644 sys-devel/dragonegg -# Bernard Cafarelli (24 Aug 2015) -# New llvm version for testing -=sys-devel/llvm-3.7.0* -=sys-devel/clang-3.7.0* - # Andreas Sturmlechner (24 Aug 2015) # Masked until >=sys-auth/consolekit-0.9.2 gets unmasked =x11-misc/sddm-0.11.0-r2
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kdelibs4support/
commit: f37bbdd1f4a8d462c8cd3daf0e63c4f755891e87
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Sep 3 09:57:34 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Sep 3 09:57:34 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f37bbdd1
kde-frameworks/kdelibs4support: restrict tests.
Package-Manager: portage-2.2.20.1
kde-frameworks/kdelibs4support/kdelibs4support-.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild
b/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild
index d3f6926..7f86ece 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild
@@ -72,6 +72,8 @@ DEPEND="${COMMON_DEPEND}
X? ( x11-proto/xproto )
"
+RESTRICT="test"
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package X X11)
[gentoo-commits] repo/gentoo:master commit in: www-client/seamonkey/
commit: 700a31387ba2b13c77a28dfc609a2a1f81f86fb3 Author: Lars Wendler gentoo org> AuthorDate: Thu Sep 3 09:59:55 2015 + Commit: Lars Wendler gentoo org> CommitDate: Thu Sep 3 10:00:18 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=700a3138 www-client/seamonkey: Bump to version 2.35 Package-Manager: portage-2.2.20.1 Signed-off-by: Lars Wendler gentoo.org> www-client/seamonkey/Manifest | 27 +++ www-client/seamonkey/metadata.xml | 3 + www-client/seamonkey/seamonkey-2.35.ebuild | 356 + 3 files changed, 386 insertions(+) diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest index 2de6918..4e5a200 100644 --- a/www-client/seamonkey/Manifest +++ b/www-client/seamonkey/Manifest @@ -1,5 +1,6 @@ DIST enigmail-1.8.2.tar.gz 1604159 SHA256 1d2700799bc52aaa8e8c9f7a0f5111281ff9fbdffc093cdff070657d574eb2a6 SHA512 51eece988f466aeb4a343719a86dc7d95ec41dfc3ec7e3d8d2f360528675c605f8f2154f10aeea6ef82ed87c784f1d13bfc978e052a9ede0072b5137f6294b11 WHIRLPOOL e12a703899e0e4c98adc58b5f4bf1f74e24a2cf09c1a706a6edca6aca06140041b293f23e6e5b05c507177b4148533ebc3431fb75592aae07d791a899ba2c45c DIST firefox-36.0-patches-01.tar.xz 4420 SHA256 9ebde39a67c05b3bd1053f16cc6ef9a9795940871da39456685cff0093c72812 SHA512 e5edc318acd367ae71bbeac554a01276be09301c052ed8054ce420f8026e11501cb853a81f05ce48df3642d5cec4e56c70502cf07c45fc514662f24177714ba1 WHIRLPOOL 7f2cda02552f9cbb4aeedcc8928ee2c624133d220fda86d3e526c97ada7d1def6ca3393c6368a70c5892b188bb3b47589c3365a66adf697464277438644d0cc9 +DIST firefox-38.0-patches-0.3.tar.xz 4796 SHA256 bfbef81748f76f5f80c3ce6e6b810b65f6266f71da02722b1e8c9fad865b02bd SHA512 a974e33759246153db7d83488f1326275efd12c44a6c8c539cbc35709b4dbd27e848bda32f302ac2baa5d8729ba20579ebc7f643419757f542972ca1a264d520 WHIRLPOOL 3549239db380c02a1575ff407ea684a14827f2250d991b5eb6c8a341ceebaca57cd2cc422e160f00dfab933385d677574cd84947da07bd282c68bb84c40fa42b DIST seamonkey-2.33-patches-01.tar.xz 944 SHA256 1612d94dddbd37fa4ce8307c1ba565c8439d082609b63c12b4971e361895566c SHA512 0132e7d06a1ea5d6c059f23e5b8a20016a1e911e8aa40ae15eaefcd141030b4d245297f1e13e508827d91bab5988db4775c8425e737654afba2ede9c2dee8392 WHIRLPOOL 4520c4eaa7e6a25f5c32e9cd1d46472e181fbd769a1c5a59c913834cec5556100eac01423b4abf4a47543d0fbae4bf83b0f4a4d6cec7a058587e2705043bf507 DIST seamonkey-2.33.1-be.xpi 842837 SHA256 bd6ccc1b70c8fe41d43b5f0f05137454f425e572a631ac9641bd7549375ede34 SHA512 a1a264e1cb794a25d22926ed4995028cf94f21fc1083d28491cf4616d9905cbf22dd006fa9298453c3349c6d9b8d3661a376513f95e3b18697d43845e7214afa WHIRLPOOL 295bf608cfa2142c9fb1ab85f1c122df2b4d27b3a6cd39c2e50f23159037165f126afe9938ce07a986c4bc2915ec3e944f3b52f5d13f3b7545d462c5966580a5 DIST seamonkey-2.33.1-ca.xpi 834200 SHA256 f46880e8582a63d6af332c76d988fabb5077fba92affc1881ab8e3d24bf6b331 SHA512 c050cb3f86c78212dfbd40343e817685965d72a90b519879e5b4291f62a4371175352b08fb2fd3aa7834fd27e263404b2bf7473a9588fcbc61f09b9f658e4777 WHIRLPOOL 7202ea355b122da09df204198373b997a683761e8ddc04568ee2cab213907b9ca3ea38cb1490268b13344462a76d26a7f007a67501d51bfc3e6696c2dbe4c4ba @@ -27,3 +28,29 @@ DIST seamonkey-2.33.1-uk.xpi 874106 SHA256 5f40259490b909023b318fa633fb8f549071c DIST seamonkey-2.33.1-zh-CN.xpi 834422 SHA256 1e07dbcfc5739a5e76b13b07327ce81a753e7bfe503a3abd9d5f656d12f918aa SHA512 16a1d1ad2993e0f89027a2fad52f09abe083d283d57a7e9d5f2eddaa3f4ac9f331f179da2b3a4e5d3d437b375cee579cb2c5bafe7a2d49c8e7e898dbb43963a5 WHIRLPOOL 36eb19c03ff8a21b86e23c372c382f6ad63165c658b9fb3152175fa1941562ba8ed41f05c51cd6e36e7fd35f1bf6d691a3ba7f0a4f08c56eead0a783e6ff6cf0 DIST seamonkey-2.33.1-zh-TW.xpi 860687 SHA256 b0c382d9fc410b7a2c4219511c461ca0cd9df14f5a8ac799cfa46d236af5d636 SHA512 51a4955f8cd7af954bd123388aa130c0ee705bf75311dac520b7b87b1b409b1e2e1093b1e5a75e63ba0a3168eb8ad6f204c935cf421eb89b3ce7529fd659b89f WHIRLPOOL df6ddde364b4276c9f6c78a462a79af9b70cd1c755a517b914b33b05260defb62beb54f74a813226c025d83bf0a87bcdbda209b98b9f8b8a7be4c713f85e7c28 DIST seamonkey-2.33.1.source.tar.bz2 203015246 SHA256 b29779cfd4b334ed21a8265ec13327aa7f35ef2895c38a971e41f3e63c85af08 SHA512 2fcd2833c140504a176da145b3fd519a22135c273ce8ea87d39e45a6255533e59dccb24367e3fc9b0575cfc7a7fe2b777296a067edafc83a3397d6916d9e3803 WHIRLPOOL c20f1dc667375608a94899546339c22134d09f74f3eae55b048ac21a6c024acbf7998d437d137963cf231b9ee07e6e69bc7b34ca7267a4ab3d3f6c51d09c4840 +DIST seamonkey-2.35-be.xpi 844271 SHA256 c1043f743a353dfb46db8f524249c808183e89f4f0f7a6181f9d5304d545f694 SHA512 2683a9e5858680a37b152c77fc15964d9b342e2d2a0fc409968b6cf35758f2bf30b3339dcd5c860ef95c56ed85c224383f95efc3d14999cd0a3e4a396c7c4644 WHIRLPOOL f3f69369b0e225cdbb8fc1ac35e4e2295ed1778df7cabd3c9f4f566b758ee6f7dc2f922e422b5b5175bc2ff2ecc15769e535810a90435d15f57f7b22217eb1bf +DIST seamonkey-2.35-ca.xpi 835414 SHA256 6b6bc56a6f780f18a8736a554fcec9b042ff8c3a4ecbef9d192d3ad6a67ed150 SHA512 7dd90e4d3124749971c66c5aa49c4a7ba2fa3813df4
[gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/
commit: 20c4e02abc9561bafa9e9552a6f2f20c28ff5bee
Author: Lars Wendler gentoo org>
AuthorDate: Thu Sep 3 10:01:44 2015 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu Sep 3 10:01:44 2015 +
URL:https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=20c4e02a
seamonkey: sync with ebuild from portage.
www-client/seamonkey/seamonkey-2.35.ebuild | 15 +--
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/www-client/seamonkey/seamonkey-2.35.ebuild
b/www-client/seamonkey/seamonkey-2.35.ebuild
index 6eb19ab..c7ba3fd 100644
--- a/www-client/seamonkey/seamonkey-2.35.ebuild
+++ b/www-client/seamonkey/seamonkey-2.35.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
+# $Id: 185037f356356bfdd329a8211c71d1ff4348c705 $
EAPI=5
WANT_AUTOCONF="2.1"
@@ -53,9 +53,9 @@ IUSE="+chatzilla +crypt +gmp-autoupdate +ipc minimal
pulseaudio +roaming selinux
SRC_URI="${SRC_URI}
${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2
- https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCHFF}.tar.xz
+ https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCHFF}.tar.xz
https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
- crypt? (
http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )"
+ crypt? (
https://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )"
ASM_DEPEND=">=dev-lang/yasm-1.1"
@@ -119,12 +119,9 @@ src_prepare() {
EPATCH_FORCE="yes" \
epatch "${WORKDIR}/seamonkey"
- epatch "${FILESDIR}"/${PN}-2.30-jemalloc-configure.patch
-
# browser patches go here
pushd "${S}"/mozilla &>/dev/null || die
- EPATCH_EXCLUDE="2000-firefox_gentoo_install_dirs.patch
- 8002_jemalloc_configure_unbashify.patch" \
+ EPATCH_EXCLUDE="2000-firefox_gentoo_install_dirs.patch" \
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}/firefox"
@@ -191,9 +188,7 @@ src_configure() {
# It doesn't compile on alpha without this LDFLAGS
use alpha && append-ldflags "-Wl,--no-relax"
- if use chatzilla ; then
- MEXTENSIONS+=",irc"
- else
+ if ! use chatzilla ; then
MEXTENSIONS+=",-irc"
fi
if ! use roaming ; then
[gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/, kde-plasma/kwin/files/
commit: 7f9ada54cb358916796ea3108ef72d371542134f
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Sep 3 10:53:35 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Sep 3 10:53:35 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7f9ada54
kde-plasma/kwin: introduce gstreamer USE flag by popular request.
Package-Manager: portage-2.2.20.1
kde-plasma/kwin/files/kwin-gstreamer-optional.patch | 15 +++
kde-plasma/kwin/kwin-5.4.49..ebuild | 10 --
kde-plasma/kwin/kwin-.ebuild| 10 --
3 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/kde-plasma/kwin/files/kwin-gstreamer-optional.patch
b/kde-plasma/kwin/files/kwin-gstreamer-optional.patch
new file mode 100644
index 000..d9ace47
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-gstreamer-optional.patch
@@ -0,0 +1,15 @@
+Disable the effect video button if gstreamer is missing.
+
+diff --git a/kcmkwin/kwincompositing/qml/Effect.qml
b/kcmkwin/kwincompositing/qml/Effect.qml
+index fcd5e8a..2331da2 100644
+--- a/kcmkwin/kwincompositing/qml/Effect.qml
b/kcmkwin/kwincompositing/qml/Effect.qml
+@@ -144,7 +144,7 @@ Rectangle {
+
+ Button {
+ id: videoButton
+-visible: model.VideoRole.toString() !== ""
++visible: false
+ iconName: "video"
+ onClicked: videoItem.showHide()
+ }
diff --git a/kde-plasma/kwin/kwin-5.4.49..ebuild
b/kde-plasma/kwin/kwin-5.4.49..ebuild
index 02c64a7..aad35e3 100644
--- a/kde-plasma/kwin/kwin-5.4.49..ebuild
+++ b/kde-plasma/kwin/kwin-5.4.49..ebuild
@@ -12,7 +12,7 @@ inherit kde5
DESCRIPTION="KDE window manager"
LICENSE="GPL-2+"
KEYWORDS=""
-IUSE="gles2 wayland"
+IUSE="gles2 gstreamer wayland"
COMMON_DEPEND="
$(add_frameworks_dep kactivities)
@@ -41,7 +41,6 @@ COMMON_DEPEND="
dev-qt/qtdbus:5
dev-qt/qtdeclarative:5
dev-qt/qtgui:5[gles2=,opengl(+)]
- dev-qt/qtmultimedia:5[gstreamer,qml]
dev-qt/qtscript:5
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
@@ -64,6 +63,7 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
$(add_plasma_dep kde-cli-tools)
+ gstreamer? ( dev-qt/qtmultimedia:5[gstreamer,qml] )
!kde-base/kwin
!kde-base/systemsettings
"
@@ -75,6 +75,12 @@ DEPEND="${COMMON_DEPEND}
test? ( x11-libs/xcb-util-wm )
"
+src_prepare() {
+ kde5_src_prepare
+
+ use gstreamer || epatch "${FILESDIR}/${PN}-gstreamer-optional.patch"
+}
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package wayland)
diff --git a/kde-plasma/kwin/kwin-.ebuild b/kde-plasma/kwin/kwin-.ebuild
index 6b00476..29049e5 100644
--- a/kde-plasma/kwin/kwin-.ebuild
+++ b/kde-plasma/kwin/kwin-.ebuild
@@ -12,7 +12,7 @@ inherit kde5
DESCRIPTION="KDE window manager"
LICENSE="GPL-2+"
KEYWORDS=""
-IUSE="gles2"
+IUSE="gles2 gstreamer"
COMMON_DEPEND="
$(add_frameworks_dep kactivities)
@@ -44,7 +44,6 @@ COMMON_DEPEND="
dev-qt/qtdbus:5
dev-qt/qtdeclarative:5
dev-qt/qtgui:5[gles2=,opengl(+)]
- dev-qt/qtmultimedia:5[gstreamer,qml]
dev-qt/qtscript:5
dev-qt/qtwayland:5
dev-qt/qtwidgets:5
@@ -62,6 +61,7 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
$(add_plasma_dep kde-cli-tools)
+ gstreamer? ( dev-qt/qtmultimedia:5[gstreamer,qml] )
!kde-base/kwin
!kde-base/systemsettings
"
@@ -72,3 +72,9 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xproto
test? ( x11-libs/xcb-util-wm )
"
+
+src_prepare() {
+ kde5_src_prepare
+
+ use gstreamer || epatch "${FILESDIR}/${PN}-gstreamer-optional.patch"
+}
[gentoo-commits] proj/sci:master commit in: dev-python/notebook/
commit: d002974b02fb229c0dea428b43d2d9a52c9c5731 Author: Marius Brehler linux sungazer de> AuthorDate: Thu Sep 3 07:27:14 2015 + Commit: Justin Lecher gentoo org> CommitDate: Thu Sep 3 07:27:14 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d002974b dev-python/notebook: Drop old Package-Manager: portage-2.2.20.1 dev-python/notebook/ChangeLog | 3 +++ dev-python/notebook/notebook-4.0.1.ebuild | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog index 90e175d..2f9c366 100644 --- a/dev-python/notebook/ChangeLog +++ b/dev-python/notebook/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ + 03 Sep 2015; Marius Brehler -notebook-4.0.1.ebuild: + dev-python/notebook: Drop old + 02 Sep 2015; Marius Brehler notebook-.ebuild: dev-python/notebook: Move setuptools from CDEPEND to DEPEND diff --git a/dev-python/notebook/notebook-4.0.1.ebuild b/dev-python/notebook/notebook-4.0.1.ebuild deleted file mode 12 index 1a1451d..000 --- a/dev-python/notebook/notebook-4.0.1.ebuild +++ /dev/null @@ -1 +0,0 @@ -notebook-.ebuild \ No newline at end of file
[gentoo-commits] proj/sci:master commit in: dev-python/notebook/
commit: 4badc3895598e8aa83d0329589a02dc386ef8738
Author: Marius Brehler linux sungazer de>
AuthorDate: Thu Sep 3 07:31:16 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Thu Sep 3 07:31:16 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4badc389
dev-python/notebook: Implement pkg_preinst(); Fixes #478
Package-Manager: portage-2.2.20.1
dev-python/notebook/ChangeLog | 6 ++
.../notebook/{notebook-4.0.4.ebuild => notebook-4.0.4-r1.ebuild}| 0
dev-python/notebook/notebook-.ebuild| 6 ++
3 files changed, 12 insertions(+)
diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog
index 2f9c366..d8f7c44 100644
--- a/dev-python/notebook/ChangeLog
+++ b/dev-python/notebook/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+*notebook-4.0.4-r1 (03 Sep 2015)
+
+ 03 Sep 2015; Marius Brehler
+ +notebook-4.0.4-r1.ebuild, -notebook-4.0.4.ebuild, notebook-.ebuild:
+ dev-python/notebook: Implement pkg_preinst(); Fixes #478
+
03 Sep 2015; Marius Brehler
-notebook-4.0.1.ebuild:
dev-python/notebook: Drop old
diff --git a/dev-python/notebook/notebook-4.0.4.ebuild
b/dev-python/notebook/notebook-4.0.4-r1.ebuild
similarity index 100%
rename from dev-python/notebook/notebook-4.0.4.ebuild
rename to dev-python/notebook/notebook-4.0.4-r1.ebuild
diff --git a/dev-python/notebook/notebook-.ebuild
b/dev-python/notebook/notebook-.ebuild
index eef13b5..8d898cb 100644
--- a/dev-python/notebook/notebook-.ebuild
+++ b/dev-python/notebook/notebook-.ebuild
@@ -47,6 +47,12 @@ DEPEND="${RDEPEND}
)
"
+pkg_preinst() {
+ # remove old mathjax folder if present
+ [[ -d "${ROOT}$(python_get_sitedir)/notebook/static/components/MathJax"
]] \
+ && rm -rf
"${ROOT}$(python_get_sitedir)/notebook/static/components/MathJax"
+}
+
python_prepare_all() {
sed \
-e "/import setup/s:$:\nimport setuptools:g" \
[gentoo-commits] proj/sci:master commit in: /
commit: b070679372b1dc17a2f86a913fae458a201ea0f4
Author: marbre linux sungazer de>
AuthorDate: Thu Sep 3 06:41:35 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Thu Sep 3 06:41:35 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b0706793
Merge pull request #483 from flacjacket/jupyter_meta
dev-python/jupyter: Initial commit
dev-python/jupyter/ChangeLog | 9 ++
dev-python/jupyter/Manifest | 1 +
dev-python/jupyter/jupyter-1.0.0.ebuild | 45 +++
dev-python/{newrelic => jupyter}/metadata.xml | 6 ++--
4 files changed, 58 insertions(+), 3 deletions(-)
[gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/
commit: 4e4ad4e26c19bccb91426290a726ce6fec4d3167 Author: Michael Palimaka gentoo org> AuthorDate: Thu Sep 3 11:03:29 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Sep 3 11:04:23 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e4ad4e2 profiles: mask fam USE flag for various KDE packages on linux. Native inotify support is preferred instead. Gentoo-bug: 559488 Gentoo-bug: 559494 Gentoo-bug: 559508 profiles/default/linux/package.use.mask | 6 ++ 1 file changed, 6 insertions(+) diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask index a735ef9..bcccd3d 100644 --- a/profiles/default/linux/package.use.mask +++ b/profiles/default/linux/package.use.mask @@ -2,6 +2,12 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Michael Palimaka (03 Sep 2015) +# Native inotify support is preferred on linux. +app-misc/strigi fam +kde-base/kdelibs fam +kde-frameworks/kcoreaddons fam + # Christian Ruppert (23 Aug 2015) # seccomp seems completely broken currently but has been added as global default # apparently... #558100
[gentoo-commits] proj/sci:master commit in: dev-python/ipython/
commit: de4f6ec1ba184508232e963a0547422eac22c12d
Author: Marius Brehler linux sungazer de>
AuthorDate: Wed Sep 2 14:05:09 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Wed Sep 2 14:05:36 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=de4f6ec1
dev-python/ipython: Fix #480; add testpath to dependencies
Package-Manager: portage-2.2.20.1
dev-python/ipython/ChangeLog | 4
dev-python/ipython/ipython-4.0.0-r1.ebuild | 1 +
2 files changed, 5 insertions(+)
diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog
index 706e50c..d17bf75 100644
--- a/dev-python/ipython/ChangeLog
+++ b/dev-python/ipython/ChangeLog
@@ -4,6 +4,10 @@
02 Sep 2015; Marius Brehler
ipython-4.0.0-r1.ebuild:
+ dev-python/ipython: Fix #480; add testpath to dependencies
+
+ 02 Sep 2015; Marius Brehler
+ ipython-4.0.0-r1.ebuild:
dev-python/ipython: Move setuptools from CDEPEND to DEPEND
02 Sep 2015; Marius Brehler
diff --git a/dev-python/ipython/ipython-4.0.0-r1.ebuild
b/dev-python/ipython/ipython-4.0.0-r1.ebuild
index 1845023..3eaa82c 100644
--- a/dev-python/ipython/ipython-4.0.0-r1.ebuild
+++ b/dev-python/ipython/ipython-4.0.0-r1.ebuild
@@ -51,6 +51,7 @@ DEPEND="${CDEPEND}
dev-python/requests[${PYTHON_USEDEP}]
dev-python/sphinx[${PYTHON_USEDEP}]
>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+ dev-python/testpath[${PYTHON_USEDEP}]
)
doc? (
dev-python/cython[${PYTHON_USEDEP}]
[gentoo-commits] proj/sci:master commit in: /
commit: f8e38f471d0171eeabdd677142dacb646cc42594
Author: Justin Lecher gentoo org>
AuthorDate: Thu Sep 3 11:04:19 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Thu Sep 3 11:04:19 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f8e38f47
Merge remote-tracking branch 'github/master'
* github/master:
dev-python/notebook: Finaly the real fix for #478
dev-python/notebook: Re-Fix #478
Drop obsolete patches
dev-python/jupyter_core: Fix tests (issue #479)
Add patch for jupyter_core tests
dev-python/notebook: Implement pkg_preinst(); Fixes #478
dev-python/notebook: Drop old
dev-python/jupyter: Initial commit
dev-python/ipython: Fix #480; add testpath to dependencies
dev-python/ipython/ChangeLog |4 +
dev-python/ipython/ipython-4.0.0-r1.ebuild |1 +
dev-python/jupyter/ChangeLog |9 +
dev-python/jupyter/Manifest|1 +
dev-python/jupyter/jupyter-1.0.0.ebuild| 45 +
dev-python/{newrelic => jupyter}/metadata.xml |6 +-
dev-python/jupyter_core/ChangeLog |7 +
dev-python/jupyter_core/Manifest |1 +
.../files/jupyter_core-4.0.4-add-test-files.patch | 50 +
...re-.ebuild => jupyter_core-4.0.4-r1.ebuild} |9 +-
dev-python/jupyter_core/jupyter_core-4.0.4.ebuild |1 -
dev-python/notebook/ChangeLog | 12 +
dev-python/notebook/Manifest |1 -
dev-python/notebook/notebook-4.0.1.ebuild |1 -
...ebook-4.0.4.ebuild => notebook-4.0.4-r1.ebuild} |0
dev-python/notebook/notebook-.ebuild |5 +
patches/ccp4/6.1.2/fix-baubles.patch | 22 -
patches/ccp4/6.1.2/rename-rapper.patch | 12 -
patches/ccp4/6.1.2/rename-superpose.patch | 12 -
patches/ccp4/6.1.2/rename-truncate.patch | 22 -
patches/jupyter_core-4.0.4-tests-dotipython.patch | 4743
21 files changed, 4889 insertions(+), 75 deletions(-)
[gentoo-commits] proj/sci:master commit in: patches/ccp4/6.1.2/
commit: f593357ab647606d698ca3318101c04d03b29598
Author: Marius Brehler linux sungazer de>
AuthorDate: Thu Sep 3 09:23:41 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Thu Sep 3 09:23:41 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f593357a
Drop obsolete patches
patches/ccp4/6.1.2/fix-baubles.patch | 22 --
patches/ccp4/6.1.2/rename-rapper.patch| 12
patches/ccp4/6.1.2/rename-superpose.patch | 12
patches/ccp4/6.1.2/rename-truncate.patch | 22 --
4 files changed, 68 deletions(-)
diff --git a/patches/ccp4/6.1.2/fix-baubles.patch
b/patches/ccp4/6.1.2/fix-baubles.patch
deleted file mode 100644
index 2c5f659..000
--- a/patches/ccp4/6.1.2/fix-baubles.patch
+++ /dev/null
@@ -1,22 +0,0 @@
ccp4i/etc/configure.def.dist 2009-01-09 16:45:08.0 +0100
-+++ ccp4i/etc/configure.def.dist.new 2009-07-07 23:17:26.0 +0200
-@@ -53,8 +53,8 @@
- RUN_IMOSFLM _text "ccp4iwish [file join [GetEnvPath CCP4I_TOP]
imosflm imosflm.tcl] project [GetCurrentProjectDir [GetCurrentProject]]"
- RUN_CCP4MG_text "ccp4mg"
- RUN_COOT _text "coot"
--RUN_BAUBLES _text "python [file join
[GetEnvPath CCP4] share smartie baubles.py]"
--RUN_DBVIEWER _text "wish [file join
[GetEnvPath CCP4] share dbccp4i application viewer.tcl]"
-+RUN_BAUBLES _text "python [file join
[GetEnvPath CCP4] share ccp4 smartie baubles.py]"
-+RUN_DBVIEWER _text "wish [file join
[GetEnvPath DBCCP4I_TOP] application viewer.tcl]"
- ENABLE_BUBBLE_HELP_logical 1
- DISABLE_TASKS _logical 1
- CCP4_SETUP_COMMAND_text setup_ccp4
-@@ -62,7 +62,7 @@
- BLT_LIBRARY _text ""
- MENU_LENGTH _positiveint 25
- HYPERTEXT_VIEWER _text firefox
--START_NETSCAPE _text netscape
-+START_NETSCAPE _text firefox
- O_MAPMAN _text mapman
- MAPMAN_MAXSIZE _positiveint 4194304
- QUANTA_MBKALL _text mbkall
diff --git a/patches/ccp4/6.1.2/rename-rapper.patch
b/patches/ccp4/6.1.2/rename-rapper.patch
deleted file mode 100644
index a50ae6d..000
--- a/patches/ccp4/6.1.2/rename-rapper.patch
+++ /dev/null
@@ -1,12 +0,0 @@
ccp4i/scripts/rapper.script 2009-02-03 11:49:50.0 +0100
-+++ ccp4i/scripts/rapper.script.new 2009-03-12 23:34:47.0 +0100
-@@ -17,7 +17,7 @@
-
- #set up command line
-
--set cmd "[BinPath rapper]"
-+set cmd "[BinPath rappermc]"
-
- set rapperdatadir [FileJoin [GetEnvPath CCP4] share rapper]
- set paramsfile [FileJoin [GetEnvPath CCP4] share rapper params.xml]
-
diff --git a/patches/ccp4/6.1.2/rename-superpose.patch
b/patches/ccp4/6.1.2/rename-superpose.patch
deleted file mode 100644
index 90480eb..000
--- a/patches/ccp4/6.1.2/rename-superpose.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -arNu ccp4-6.1.1/ccp4i/scripts/superpose.script
ccp4-6.1.1.new/ccp4i/scripts/superpose.script
ccp4-6.1.1/ccp4i/scripts/superpose.script 2006-07-26 16:22:49.0
+0200
-+++ ccp4-6.1.1.new/ccp4i/scripts/superpose.script 2009-07-05
22:11:59.0 +0200
-@@ -21,7 +21,7 @@
-
- if { [regexp SSM $SUPERPOSE_MODE ] } {
-
--set cmd "[BinPath superpose] \"$XYZIN2\" -s $SSM_MOVING \"$XYZIN1\" -s
$SSM_FIXED \"$XYZOUT_LOCAL\""
-+set cmd "[BinPath superpose-ccp4] \"$XYZIN2\" -s $SSM_MOVING \"$XYZIN1\"
-s $SSM_FIXED \"$XYZOUT_LOCAL\""
- set status [Execute $cmd "" program_status report ]
-
- } elseif { [regexp TOP $SUPERPOSE_MODE ] } {
diff --git a/patches/ccp4/6.1.2/rename-truncate.patch
b/patches/ccp4/6.1.2/rename-truncate.patch
deleted file mode 100644
index 26f1cda..000
--- a/patches/ccp4/6.1.2/rename-truncate.patch
+++ /dev/null
@@ -1,22 +0,0 @@
./ccp4i/templates/truncate.com.orig2009-03-02 23:31:04.0
-0800
-+++ ./ccp4i/templates/truncate.com 2009-03-02 23:31:08.0 -0800
-@@ -11,7 +11,7 @@
- $SYMMETRY symmetry $SPACE_GROUP
- $CELL cell $CELL_1 $CELL_2 $CELL_3 $CELL_4 $CELL_5 $CELL_6
-
--1 truncate
-+1 ftruncate
- - { [StringSame $APPLY_TRUNCATE "WILSON" ] } YES | NO
- {[IfSet $ANOMALOUS]} anomalous
- - $ANOMALOUS YES | NO
./ccp4i/scripts/truncate.script.orig 2009-03-02 23:39:04.0
-0800
-+++ ./ccp4i/scripts/truncate.script2009-03-02 23:39:41.0 -0800
-@@ -45,7 +45,7 @@
-
- CreateComScript truncate truncate_script
-
-- set cmd "[BinPath truncate] HKLIN \"$HKLIN\""
-+ set cmd "[BinPath ftruncate] HKLIN \"$HKLIN\""
- if { ![StringSame $INPUT_
[gentoo-commits] proj/sci:master commit in: dev-python/notebook/
commit: e6394fcc9c8890dbe77f47a23ce098e8b2dd17a5
Author: Marius Brehler linux sungazer de>
AuthorDate: Thu Sep 3 10:43:19 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Thu Sep 3 10:43:19 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e6394fcc
dev-python/notebook: Finaly the real fix for #478
Package-Manager: portage-2.2.20.1
dev-python/notebook/notebook-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/notebook/notebook-.ebuild
b/dev-python/notebook/notebook-.ebuild
index e9036e1..744998b 100644
--- a/dev-python/notebook/notebook-.ebuild
+++ b/dev-python/notebook/notebook-.ebuild
@@ -70,5 +70,5 @@ python_install() {
pkg_preinst() {
# remove old mathjax folder if present
- rm -rf "${ROOT}"/usr/lib*/python*/notebook/static/components/MathJax
+ rm -rf
"${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax
}
[gentoo-commits] proj/sci:master commit in: dev-python/jupyter/
commit: cd0458c433e8a7ed634730f6098abfa865cf749d
Author: Sean Vig gmail com>
AuthorDate: Thu Sep 3 03:46:35 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Thu Sep 3 03:46:35 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=cd0458c4
dev-python/jupyter: Initial commit
dev-python/jupyter/ChangeLog| 9 +++
dev-python/jupyter/jupyter-1.0.0.ebuild | 45 +
dev-python/jupyter/metadata.xml | 12 +
3 files changed, 66 insertions(+)
diff --git a/dev-python/jupyter/ChangeLog b/dev-python/jupyter/ChangeLog
new file mode 100644
index 000..a81b063
--- /dev/null
+++ b/dev-python/jupyter/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for dev-python/jupyter
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Id$
+
+*jupyter-1.0.0 (02 Sep 2015)
+
+ 02 Sep 2015; Sean Vig +jupyter-1.0.0.ebuild,
+ +metadata.xml:
+ dev-python/jupyter: Initial commit
diff --git a/dev-python/jupyter/jupyter-1.0.0.ebuild
b/dev-python/jupyter/jupyter-1.0.0.ebuild
new file mode 100644
index 000..e1142bd
--- /dev/null
+++ b/dev-python/jupyter/jupyter-1.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter metapackage. Install all the Jupyter components in one
go."
+HOMEPAGE="http://jupyter.org";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="
+ dev-python/notebook[${PYTHON_USEDEP}]
+ dev-python/qtconsole[${PYTHON_USEDEP}]
+ dev-python/jupyter_console[${PYTHON_USEDEP}]
+ dev-python/nbconvert[${PYTHON_USEDEP}]
+ dev-python/ipykernel[${PYTHON_USEDEP}]
+ dev-python/ipywidgets[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ # Prevent un-needed download during build
+ if use doc; then
+ sed -e "/^'sphinx.ext.intersphinx',/d" -i
docs/source/conf.py || die
+ fi
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_install_all() {
+ use doc && HTML_DOCS=( "${S}"/docs/build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/jupyter/metadata.xml b/dev-python/jupyter/metadata.xml
new file mode 100644
index 000..00118fe
--- /dev/null
+++ b/dev-python/jupyter/metadata.xml
@@ -0,0 +1,12 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+ sci
+
+Install the Jupyter system, including the notebook, qtconsole, and the IPython
kernel.
+
+
+jupyter
+jupyter/jupyter
+
+
[gentoo-commits] proj/sci:master commit in: dev-python/notebook/
commit: 83eb6b5b05f62e0e392f4476006bee42037ae80b
Author: Marius Brehler linux sungazer de>
AuthorDate: Thu Sep 3 10:21:42 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Thu Sep 3 10:21:42 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=83eb6b5b
dev-python/notebook: Re-Fix #478
Package-Manager: portage-2.2.20.1
dev-python/notebook/ChangeLog| 3 +++
dev-python/notebook/notebook-.ebuild | 11 +--
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog
index d8f7c44..d430e4c 100644
--- a/dev-python/notebook/ChangeLog
+++ b/dev-python/notebook/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 03 Sep 2015; Marius Brehler notebook-.ebuild:
+ dev-python/notebook: Re-Fix #478
+
*notebook-4.0.4-r1 (03 Sep 2015)
03 Sep 2015; Marius Brehler
diff --git a/dev-python/notebook/notebook-.ebuild
b/dev-python/notebook/notebook-.ebuild
index 8d898cb..e9036e1 100644
--- a/dev-python/notebook/notebook-.ebuild
+++ b/dev-python/notebook/notebook-.ebuild
@@ -47,12 +47,6 @@ DEPEND="${RDEPEND}
)
"
-pkg_preinst() {
- # remove old mathjax folder if present
- [[ -d "${ROOT}$(python_get_sitedir)/notebook/static/components/MathJax"
]] \
- && rm -rf
"${ROOT}$(python_get_sitedir)/notebook/static/components/MathJax"
-}
-
python_prepare_all() {
sed \
-e "/import setup/s:$:\nimport setuptools:g" \
@@ -73,3 +67,8 @@ python_install() {
ln -sf "${EPREFIX}/usr/share/mathjax"
"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
}
+
+pkg_preinst() {
+ # remove old mathjax folder if present
+ rm -rf "${ROOT}"/usr/lib*/python*/notebook/static/components/MathJax
+}
[gentoo-commits] proj/sci:master commit in: sci-chemistry/NMRdyn/files/, sci-chemistry/NMRdyn/
commit: e20bb16d953a7ab13121fff12f30309c14d61c43
Author: Justin Lecher gentoo org>
AuthorDate: Thu Sep 3 11:04:13 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Thu Sep 3 11:04:13 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e20bb16d
sci-chemistry/NMRdyn: New package, ebuild written by me
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher gentoo.org>
sci-chemistry/NMRdyn/NMRdyn-3.2.5.ebuild | 79 ++
.../NMRdyn/files/NMRdyn-3.2.5-redefinition.patch | 19 ++
sci-chemistry/NMRdyn/metadata.xml | 8 +++
3 files changed, 106 insertions(+)
diff --git a/sci-chemistry/NMRdyn/NMRdyn-3.2.5.ebuild
b/sci-chemistry/NMRdyn/NMRdyn-3.2.5.ebuild
new file mode 100644
index 000..8b6445f
--- /dev/null
+++ b/sci-chemistry/NMRdyn/NMRdyn-3.2.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic qmake-utils toolchain-funcs
+
+MY_P="${PN}_${PV}"
+
+DESCRIPTION="NMR relaxation studies of protein association"
+HOMEPAGE="http://sourceforge.net/projects/nmrdyn/";
+SRC_URI="${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+qt4"
+
+RDEPEND="
+ sci-libs/gsl
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+RESTRICT="mirror fetch"
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_nofetch() {
+ elog "Please contact the authors and get ${A}"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-redefinition.patch
+ append-cppflags "$($(tc-getPKG_CONFIG) --cflags gsl)"
+ if use qt4; then
+ cd src/NMRdynGUI || die
+ cat >> NMRdynGUI.pro <<- EOF
+ INCLUDEPATH += "${S}"/src/algorithm/src
+ LIBS += $($(tc-getPKG_CONFIG) --libs gsl)
+ MOC_DIR = moc/
+ OBJECTS += ../objects/*.o
+ EOF
+ fi
+}
+
+src_configure() {
+ if use qt4; then
+ cd src/NMRdynGUI || die
+ eqmake4 NMRdynGUI.pro
+ fi
+}
+
+src_compile() {
+ emake \
+ -C src/algorithm \
+ CXX="$(tc-getCXX)" \
+ CPPFLAGS="${CPPFLAGS}" \
+ CXXFLAGS="${CXXFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ LIBS="$($(tc-getPKG_CONFIG) --libs gsl)"
+
+ if use qt4; then
+ cd src/NMRdynGUI || die
+ emake
+ fi
+}
+
+src_install() {
+ dobin ${PN} r1r2
+ use qt4 && dobin src/NMRdynGUI/${PN}GUI
+ dodoc HISTORY README_LINUX.txt NMRdynManual.doc README_gridsearch.txt
+}
diff --git a/sci-chemistry/NMRdyn/files/NMRdyn-3.2.5-redefinition.patch
b/sci-chemistry/NMRdyn/files/NMRdyn-3.2.5-redefinition.patch
new file mode 100644
index 000..f943dd8
--- /dev/null
+++ b/sci-chemistry/NMRdyn/files/NMRdyn-3.2.5-redefinition.patch
@@ -0,0 +1,19 @@
+ src/NMRdynGUI/src/BatchWizard.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/NMRdynGUI/src/BatchWizard.cpp
b/src/NMRdynGUI/src/BatchWizard.cpp
+index 653d8e6..e4a8c73 100755
+--- a/src/NMRdynGUI/src/BatchWizard.cpp
b/src/NMRdynGUI/src/BatchWizard.cpp
+@@ -159,9 +159,9 @@ bool
+ BatchInputPage::isComplete ()
+ {
+int n = workBook->count ();
+- for (int i = 0; i < n; i++)
++ for (int k = 0; k < n; k++)
+{
+- WorkSheet *worksheet = workBook->getWorkSheet (i);
++ WorkSheet *worksheet = workBook->getWorkSheet (k);
+ int nRows = worksheet->rowCount();
+ int nCols = worksheet->columnCount();
+ int i, j;
diff --git a/sci-chemistry/NMRdyn/metadata.xml
b/sci-chemistry/NMRdyn/metadata.xml
new file mode 100644
index 000..c166166
--- /dev/null
+++ b/sci-chemistry/NMRdyn/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ j...@gentoo.org
+ Justin Lecher
+
+
[gentoo-commits] proj/sci:master commit in: dev-python/jupyter_core/, dev-python/jupyter_core/files/
commit: 06d80c6d562769063138ba6438905d7021ea4393
Author: Marius Brehler linux sungazer de>
AuthorDate: Thu Sep 3 09:22:58 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Thu Sep 3 09:22:58 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=06d80c6d
dev-python/jupyter_core: Fix tests (issue #479)
Package-Manager: portage-2.2.20.1
dev-python/jupyter_core/ChangeLog | 7 +++
.../files/jupyter_core-4.0.4-add-test-files.patch | 50 ++
.../jupyter_core/jupyter_core-4.0.4-r1.ebuild | 45 +++
dev-python/jupyter_core/jupyter_core-4.0.4.ebuild | 1 -
4 files changed, 102 insertions(+), 1 deletion(-)
diff --git a/dev-python/jupyter_core/ChangeLog
b/dev-python/jupyter_core/ChangeLog
index 22e24e8..37f0420 100644
--- a/dev-python/jupyter_core/ChangeLog
+++ b/dev-python/jupyter_core/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+*jupyter_core-4.0.4-r1 (03 Sep 2015)
+
+ 03 Sep 2015; Marius Brehler
+ +files/jupyter_core-4.0.4-add-test-files.patch,
+jupyter_core-4.0.4-r1.ebuild,
+ -jupyter_core-4.0.4.ebuild:
+ dev-python/jupyter_core: Fix tests (issue #479)
+
*jupyter_core-4.0.4 (01 Sep 2015)
01 Sep 2015; Marius Brehler
diff --git
a/dev-python/jupyter_core/files/jupyter_core-4.0.4-add-test-files.patch
b/dev-python/jupyter_core/files/jupyter_core-4.0.4-add-test-files.patch
new file mode 100644
index 000..d7b448c
--- /dev/null
+++ b/dev-python/jupyter_core/files/jupyter_core-4.0.4-add-test-files.patch
@@ -0,0 +1,50 @@
+Patch to fix testing. Fixes
+https://github.com/gentoo-science/sci/issues/479
+
+Upstream issue:
+https://github.com/jupyter/jupyter_core/issues/50
+
+From 38b01f31f4793f4ccd427f0dee095bcb2a99b3c9 Mon Sep 17 00:00:00 2001
+From: Min RK
+Date: Tue, 1 Sep 2015 09:28:17 +0200
+Subject: [PATCH] add test files to package data
+
+---
+ setup.py | 14 ++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/setup.py b/setup.py
+index 0653dbd..f155663 100644
+--- a/setup.py
b/setup.py
+@@ -31,6 +31,19 @@ version_ns = {}
+ with open(pjoin(here, 'jupyter_core', 'version.py')) as f:
+ exec(f.read(), {}, version_ns)
+
++def find_package_data():
++"""Find package data (testing support files)"""
++package_data = {}
++package_data['jupyter_core.tests'] = test_files = []
++test_dir = pjoin('jupyter_core', 'tests')
++prefix_len = len(test_dir) + len(os.sep)
++for parent, dirs, files in os.walk(test_dir):
++if files:
++test_files.append(pjoin(parent[prefix_len:], '*.*'))
++
++return package_data
++
++package_data = find_package_data()
+
+ setup_args = dict(
+ name= 'jupyter_core',
+@@ -38,6 +51,7 @@ setup_args = dict(
+ packages= ['jupyter_core',
+'jupyter_core.utils',
+'jupyter_core.tests'],
++package_data= package_data,
+ scripts = glob(pjoin('scripts', '*')),
+ description = "Jupyter core package. A base package on which
Jupyter projects rely.",
+ long_description= """There is no reason to install this package on
its own.""",
+--
+2.4.6
+
diff --git a/dev-python/jupyter_core/jupyter_core-4.0.4-r1.ebuild
b/dev-python/jupyter_core/jupyter_core-4.0.4-r1.ebuild
new file mode 100644
index 000..6ed3dbe
--- /dev/null
+++ b/dev-python/jupyter_core/jupyter_core-4.0.4-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python{3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core common functionality of Jupyter projects"
+HOMEPAGE="http://jupyter.org";
+
+if [ ${PV} == "" ] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/jupyter/${PN}.git
git://github.com/jupyter/${PN}.git"
+else
+ SRC_URI="
+ mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+
https://raw.githubusercontent.com/gentoo-science/sci/master/patches/${P}-tests-dotipython.patch";
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+ dev-python/traitlets[${PYTHON_USEDEP}]
+ "
+DEPEND="${RDEPEND}
+ test? ( dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-cov[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}] )
+ "
+
+PATCHES=(
+ "${FILESDIR}"/${P}-add-test-files.patch
+ "${DISTDIR}"/${P}-tests-dotipython.patch
+)
+
+python_test() {
+ distutils_install_for_testing
+ cd "${TEST_DIR}"/lib || die
+ py.test jupyter_core || die
+}
diff --git a/dev-python/jupyter_core/jupyter_core-4.0.4.ebuild
b/dev-python/jupyter_core/jupyter_core-4.0.4.ebuild
deleted file mode 12
index 6577c42..000
--- a/dev-python/jupyter_core/jupyter_core-4.0.4.ebuild
+++ /dev/null
@@ -1
[gentoo-commits] repo/gentoo:master commit in: net-misc/wicd/files/, net-misc/wicd/
commit: 48ab49eb60eea5749329917c04f8f3a1d51a7dd7
Author: Thomas Kahle gentoo org>
AuthorDate: Thu Sep 3 11:09:09 2015 +
Commit: Thomas Kahle gentoo org>
CommitDate: Thu Sep 3 11:09:22 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48ab49eb
net-misc/wicd: one more urwid compat patch from launchpad
Package-Manager: portage-2.2.20.1
.../wicd/files/wicd-1.7.3-bitrate-property.patch | 19 +++
net-misc/wicd/wicd-1.7.3-r2.ebuild | 144 +
2 files changed, 163 insertions(+)
diff --git a/net-misc/wicd/files/wicd-1.7.3-bitrate-property.patch
b/net-misc/wicd/files/wicd-1.7.3-bitrate-property.patch
new file mode 100644
index 000..6ac3902
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.3-bitrate-property.patch
@@ -0,0 +1,19 @@
+--- curses/netentry_curses.py 2015-02-15 18:29:05.0 +0100
curses/netentry_curses.py 2015-02-15 18:31:24.0 +0100
+@@ -538,11 +538,12 @@
+ self.bitrates = wireless.GetAvailableBitrates()
+ self.bitrates.append('auto')
+ self.bitrate_combo.set_list(self.bitrates)
+-self.bitrate_combo.set_focus(
+-self.bitrates.index(
+-wireless.GetWirelessProperty(networkID, 'bitrate')
++if wireless.GetWirelessProperty(networkID, 'bitrate'):
++self.bitrate_combo.set_focus(
++self.bitrates.index(
++wireless.GetWirelessProperty(networkID, 'bitrate')
++)
+ )
+-)
+ self.allow_lower_bitrates_chkbox.set_state(
+ to_bool(self.format_entry(networkID, 'allow_lower_bitrates'))
+ )
diff --git a/net-misc/wicd/wicd-1.7.3-r2.ebuild
b/net-misc/wicd/wicd-1.7.3-r2.ebuild
new file mode 100644
index 000..8c58d1f
--- /dev/null
+++ b/net-misc/wicd/wicd-1.7.3-r2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses?,xml"
+
+inherit eutils distutils-r1 linux-info readme.gentoo systemd
+
+DESCRIPTION="A lightweight wired and wireless network manager for Linux"
+HOMEPAGE="https://launchpad.net/wicd";
+SRC_URI="https://launchpad.net/wicd/1.7/${PV}/+download/${P}.tar.gz
+ mac4lin? (
https://dev.gentoo.org/~anarchy/dist/wicd-mac4lin-icons.tar.xz )
+ ambiance? (
http://freetimesblog.altervista.org/blog/wp-content/uploads/downloads/2010/05/Icone-Wicd-Lucid.tar.gz
)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="doc X ambiance +gtk ioctl libnotify mac4lin ncurses nls +pm-utils
gnome-shell"
+
+DEPEND="nls? ( dev-python/Babel[${PYTHON_USEDEP}] )"
+RDEPEND="${PYTHON_DEPS}
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ X? (
+ gtk? ( dev-python/pygtk[${PYTHON_USEDEP}] )
+ || (
+ x11-misc/ktsuss
+ x11-libs/gksu
+ kde-apps/kdesu
+ )
+ )
+ || (
+ net-misc/dhcpcd
+ net-misc/dhcp
+ net-misc/pump
+ )
+ net-wireless/wireless-tools
+ net-wireless/wpa_supplicant
+ || (
+ sys-apps/net-tools
+ sys-apps/ethtool
+ )
+ !gtk? ( dev-python/pygobject:2[${PYTHON_USEDEP}] )
+ ioctl? ( dev-python/python-iwscan[${PYTHON_USEDEP}]
+dev-python/python-wpactrl[${PYTHON_USEDEP}] )
+ libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+ ncurses? (
+ dev-python/urwid[${PYTHON_USEDEP}]
+ dev-python/pygobject:2[${PYTHON_USEDEP}]
+ )
+ pm-utils? ( sys-power/pm-utils )
+ gnome-shell? ( gnome-base/gnome-shell )
+ "
+
+src_prepare() {
+ CONFIG_CHECK="~CFG80211_WEXT"
+ local WARNING_CFG80211_WEXT="Wireless extensions have not been \
+ configured in your kernel. Wicd will not work unless CFG80211_WEXT is
set."
+ check_extra_config
+
+ epatch "${FILESDIR}"/${PN}-init-sve-start.patch
+ # The Categories entry in the .desktop files is outdated
+ epatch "${FILESDIR}"/${PN}-1.7.2.4-fix-desktop-categories.patch
+ # Upstream bug https://bugs.launchpad.net/wicd/+bug/1412413
+ # Creates files -> give -p
+ epatch -p1 "${FILESDIR}"/${P}-add-missing-gnome-shell-extension.patch
+ # If LANG is undefined, build can fail (bug 537202)
+ epatch "${FILESDIR}"/${P}-undefined-LANG.patch
+ # Fix urwid compat again
+ epatch "${FILESDIR}"/${P}-urwid-1.3.0.patch
+ # Another compatibility patch from launchpad bug 1075399
+ epatch "${FILESDIR}"/${P}-bitrate-property.patch
+ # get rid of opts variable to fix bug 381885
+ sed -i "/opts/d" "in/init=gentoo=wicd.in" || die
+ # Need to ensure that generated scripts use Python 2 at run time.
+ sed -e "s:self
[gentoo-commits] repo/gentoo:master commit in: app-misc/strigi/
commit: d18e5f2b0bf52f3cb45c9005fed38820945fd164 Author: Michael Palimaka gentoo org> AuthorDate: Thu Sep 3 11:10:44 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Sep 3 11:11:54 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d18e5f2b app-misc/strigi: enable inotify USE flag by default. Gentoo-bug: 559488 Package-Manager: portage-2.2.20.1 app-misc/strigi/strigi-0.7.8-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/strigi/strigi-0.7.8-r1.ebuild b/app-misc/strigi/strigi-0.7.8-r1.ebuild index eb9271e..35bc48b 100644 --- a/app-misc/strigi/strigi-0.7.8-r1.ebuild +++ b/app-misc/strigi/strigi-0.7.8-r1.ebuild @@ -20,7 +20,7 @@ HOMEPAGE="https://projects.kde.org/projects/kdesupport/strigi/strigi"; LICENSE="GPL-2" SLOT="0" -IUSE="clucene +dbus debug exif fam ffmpeg inotify libav log +qt4 test" +IUSE="clucene +dbus debug exif fam ffmpeg +inotify libav log +qt4 test" RDEPEND=" app-arch/bzip2
[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/
commit: efee6105629815a6214c1809098d72d5d609beeb
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Sep 3 13:07:00 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Sep 3 13:07:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efee6105
app-office/calligra: version bump.
Gentoo-bug: 559506
Package-Manager: portage-2.2.20.1
app-office/calligra/Manifest | 1 +
app-office/calligra/calligra-2.9.7.ebuild | 224 ++
2 files changed, 225 insertions(+)
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 39ae24a..a8a3842 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,3 +1,4 @@
DIST calligra-2.8.5.tar.xz 138928992 SHA256
92b8828ec64b46124b29a03bae13c143e3ed771adf3186fa938c765e5eac2fbd SHA512
09e32b7ce2415daae2ac3c1871fc1bc270210cbf5bc774f622922f8adb20e639db3dfb16c2974404b4395b30f8367a7ddd0016363a8b3e46fa24ff3fde1e4c14
WHIRLPOOL
b4cc14353b7f9a457510a745b711283481f969e10ffee2847253b123ba2ea03f61d8abfdda2bcdb463c6bba8f2d8634e1536259f5be3d44778104bc8f28f79fe
DIST calligra-2.8.7.tar.xz 138966248 SHA256
af6b8b74ea077e5bbfa398e3ae96866b9a3ccfbc10224e9f341e59643be80eb5 SHA512
e09fcbb6708d73db3b31027c4393a138fbf5c47d1b777dd4a3b94f6e668d67ac963cfadb320350c63f1b2d1173edc67dc2100704899176c196865fb4d2ce7442
WHIRLPOOL
ce082f04cfb7947219e317ba9a4a6ce436a3aa0784f1cad6206f3febd072f17796ccbb89227d3c8dede1eafc647409b26f1f4fb304b1d482db0fe8c758b9
DIST calligra-2.9.6.tar.xz 194239580 SHA256
78564137133e2f45065085df66ce2ab31478517c10163a06ba690a2d3a98a184 SHA512
d51b20c3d53a09ced3347b117de6827c5c29e31b198eff8bc136f0d6f604991371c6c4705d0ff3c6bcc64c017f0a14139d4b0529b02973909d80a25223e59f07
WHIRLPOOL
848884f830e0b8b2c6b8ed73d11222598295ca56ed4db826f4a9c3d3be42d5a65f5e50879a4fed68d6ae004962b799e23d6978a0943ff6b8900728b62dec43c0
+DIST calligra-2.9.7.tar.xz 194348264 SHA256
7a641a1669739ff55809fd6f2c22d673843ac41f64e82f5ca6cb3e60c7c82781 SHA512
89b6b43113dfd7304c9d88c79fe8ecce9d1cf5e6a82a401df6d0c5bad28c450af6e4012e859ccb1595f638513f79bb00f15cbc9f8cad03801c5aa1440b1b8a1f
WHIRLPOOL
d15fcf5458b25ae30e98031c541c85cac1658a435c8fa432fc7d3de44ebda7fa56ffab61b642c196d639d1bc9737f386e76dc75d7d51baa2efc0ed79d51dd9fc
diff --git a/app-office/calligra/calligra-2.9.7.ebuild
b/app-office/calligra/calligra-2.9.7.ebuild
new file mode 100644
index 000..97cea47
--- /dev/null
+++ b/app-office/calligra/calligra-2.9.7.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# note: files that need to be checked for dependencies etc:
+# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
+# krita/CMakeLists.txt
+
+EAPI=5
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_HANDBOOK="optional"
+KDE_LINGUAS_LIVE_OVERRIDE="true"
+OPENGL_REQUIRED="optional"
+inherit check-reqs kde4-base versionator
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra.org/";
+
+case ${PV} in
+ 2.[456789].[789]?)
+ # beta or rc releases
+ SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;;
+ 2.[456789].?)
+ # stable releases
+ SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
+ 2.[456789].)
+ # stable branch live ebuild
+ SRC_URI="" ;;
+ )
+ # master branch live ebuild
+ SRC_URI="" ;;
+esac
+
+LICENSE="GPL-2"
+SLOT="4"
+
+if [[ ${KDE_BUILD_TYPE} == release ]] ; then
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+IUSE="attica color-management +crypt +eigen +exif fftw +fontconfig freetds
++glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms
+marble mysql +okular openexr +pdf postgres spacenav sybase test tiff +threads
++truetype vc xbase +xml"
+
+# Don't use Active, it's broken on desktops.
+CAL_FTS="author braindump flow gemini karbon kexi krita plan sheets stage
words"
+for cal_ft in ${CAL_FTS}; do
+ IUSE+=" calligra_features_${cal_ft}"
+done
+unset cal_ft
+
+REQUIRED_USE="
+ calligra_features_author? ( calligra_features_words )
+ calligra_features_gemini? ( opengl )
+ calligra_features_krita? ( eigen exif lcms opengl )
+ calligra_features_plan? ( kdepim )
+ calligra_features_sheets? ( eigen )
+ vc? ( calligra_features_krita )
+ test? ( calligra_features_karbon )
+"
+
+RDEPEND="
+ $(add_kdeapps_dep knewstuff)
+ dev-lang/perl
+ dev-libs/boost
+ dev-qt/qtcore:4[exceptions]
+ media-libs/libpng:0
+ sys-libs/zlib
+ virtual/libiconv
+ attica? ( dev-libs/libattica )
+ color-management? ( media-libs/opencolorio )
+ crypt? ( app-crypt/qca:2[qt4(+)] )
+ eigen? ( dev-cpp/eigen:3 )
+ exif? ( media-gfx/exiv2:= )
+ fftw? ( sci-libs/fftw:3.0 )
+ fontconfig? ( media-libs/fontconfig )
+ freetds? ( dev-db/freetds )
+
[gentoo-commits] repo/gentoo:master commit in: app-office/calligra-l10n/
commit: 8bcb73af06ab65a45901d0a216d2fc69eedd3d4f Author: Michael Palimaka gentoo org> AuthorDate: Thu Sep 3 13:06:28 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Sep 3 13:07:48 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bcb73af app-office/calligra-l10n: version bump. Gentoo-bug: 559506 Package-Manager: portage-2.2.20.1 app-office/calligra-l10n/Manifest | 29 +++ .../calligra-l10n/calligra-l10n-2.9.7.ebuild | 89 ++ 2 files changed, 118 insertions(+) diff --git a/app-office/calligra-l10n/Manifest b/app-office/calligra-l10n/Manifest index e0ec7e3..ed86b6f 100644 --- a/app-office/calligra-l10n/Manifest +++ b/app-office/calligra-l10n/Manifest @@ -1,89 +1,118 @@ DIST calligra-l10n-bs-2.8.5.tar.xz 369028 SHA256 232eaae993c88f712cc2e38ac90aea66d478b0e981bbc4fcecde508efe9b17ac SHA512 7524d3d54af09107dae20bd167b26dad3c51990bef98fc0d30627ce3c36dc5162bf8dd286e473c56674f7c894fba310aaf67ec1f048091d06349ff9906c1b5ac WHIRLPOOL 42d5be5b9f8575afd9012991a8ec9d375769861fcda1fed1563764ecda1b6755fc308deb225791a5469c344ef1ba09159291b8d98342f3049c18a1dc8b02c1cd DIST calligra-l10n-bs-2.8.7.tar.xz 369576 SHA256 b7807f655545b96f693e9b9395001b983ef0e4b61601198b34ca8ad156dbb660 SHA512 0a73ce3c7ff8caef7c474cd37f1a543785fd5e44ff09771d216b8c8ff5d207c650a94a6b8cb8cf85c14715afa89c2bacfe5ef88b480cd348348e61615e7adc70 WHIRLPOOL e1ec9a4c90e9d3a5af595031a32871dc05660f206ae3b6e3e98507c2660045f51b42348de4f1e80ee072e0662d248ea50ca47e04753afa78936f0c35d3ea4852 DIST calligra-l10n-bs-2.9.6.tar.xz 410516 SHA256 8c08cf0b8c3ea1fb0da358e6c0375a2b7300b6b40ab68a5f314e69552c91c747 SHA512 bbae90668e9c2e0358328ffd0ce13c29e203efbbacdb2fcc44ac5138e15d63731458c74ab18621f459a032fe3fc945b9ed1702409099906f066863646cc87b35 WHIRLPOOL c01bf4a3d360fed3efa71f3dc3706174d68ae21cf6420558d041b8961d63e974020cf3349051bbec4ff957e370186d01049e46315df3979e4595ed6ae3995644 +DIST calligra-l10n-bs-2.9.7.tar.xz 417464 SHA256 f1f656a2c1b59695ac9bccc4eae6331b002204716023cf5c9d0231b129e91488 SHA512 5fe6db9434d15a93df4d2a1565b99586de98c790fca3e9db49df07c8e20a9e6b09b48b36bf45b1672981d8ddc281b18c2fc7ceda657b770e70980d59d5b2aa42 WHIRLPOOL 1cdc44718aae6c2c9e6a6836a29b0c42f9c98dcdf1dbedec559c64e9bd218f72d3c929a42d719b08eed76554c3407ceb72dc9d3689a7c40f4fc1a0633e47b7da DIST calligra-l10n-ca-2.8.5.tar.xz 525332 SHA256 fbd16eaf2d9ac3ded7550cee2ec06f2b5d47c80d49638ce0c8c625c5ef2969d7 SHA512 f665125e023397130d7b4e602c75c268469ffac570734b9902895c23b6d5c6982d2b243541bcb27d4a508d9a10368f39949de434604575f2cab436b7e5aa9110 WHIRLPOOL 9bd93979c450c08f4fd1d36a0d87d575608ffac4455183eb789d39331de02685043fa43656588d54023ee42d3cea9bacba1c33c13de63ab90fdf39dc9efeaaac DIST calligra-l10n-ca-2.8.7.tar.xz 526820 SHA256 820c3f7d3795e50359c354e18dc6b6a17a0cf0c4dc87e057fddd16bc4875e7fb SHA512 15a8e44fe3ece6a0be55b08e2ea556f081ef4c9ab34dc2d7d8c92a98f94987107ea271e3872d72193a49d694222b88fcd6fd881c31cd976962ba7ba4569c4f06 WHIRLPOOL 6b41ce70b26565b8d2437bc2de0887f9ba5921d6bf9b395a6923683d6c323d838eb49d0c49010dcb967abcf0c14e02587bc107d99be99d47a7278c85b035f6c7 DIST calligra-l10n-ca-2.9.6.tar.xz 574612 SHA256 7de72bac83037d9340b67cadf8a42866c3ce4006ef3124916be185303491568d SHA512 e345f92aa28d80c8e2bde22cf47dd93f612163bf05ff98d12e7517c49164f6cee0ff60a317bff7c5b21d494fb554d2f2842fbcd871e3c100228471ff4ac652dc WHIRLPOOL 8dd006fb573f11518c7f0686550ac6a6d84cc19b34facf50e563da266e65466b45565a16297fddca1ece35687f61e3de7e3c2f1fcb8f3b220aac87be7a1f34c5 +DIST calligra-l10n-ca-2.9.7.tar.xz 584564 SHA256 eab76e0140310a19fb1f1a97d8cfbe1d53fc30b0b67aebaee0248693461395f9 SHA512 18db40c1edb80a13773fb71130b678eeb3abd9f8a1883f8b191bcb76b324cf75c8dc0967aafbbde64508ba4586b713eb9721f2ac067258f8baa4e4bf0d6e72df WHIRLPOOL ea2a941431ad6f07080dfa54d8fc10d1b48eab33100f0b2ad1d8761c50a717d11731bfc8b040bf33bb10044ac3d5e87eb4a2e6bae9d85c5639e825326e2b DIST calligra-l10n...@valencia-2.8.5.tar.xz 358816 SHA256 ed46537d00103138c47802e3246e0ca9d63cb85f59314746c9f4083e4bed305d SHA512 67b7681b5de230ca23c5dfeed55c4b6999cff396cad1dc7eef43970638ab5cd529881846d6c98dcc12249e2a3bc5c4c1420ae7c616ee301f0ba9613cac910829 WHIRLPOOL 3c93f9e53d9cdc33762f4e86cd28706bdfdddbec6145f1686207ba8570d518388dee3285bc060f325ad631298a730e7c94555848f9373ca7339ca3198fe77b85 DIST calligra-l10n...@valencia-2.8.7.tar.xz 359284 SHA256 f6c996581264b8c3f4e852e9b275e53874b566c285d4d2eb53bf00014f53a84b SHA512 193bd2311347fa24d129773a3edd40800799537aa50b955db1053b9fb0052d32cb6cccefa7a127c10d931c938bbc490cb06e0681d8636606ef6f7aaf302b WHIRLPOOL f4125d710ef685f226c830588c873090b2a5a9deec01ce7f2d77854cdc451f878efc8c93236efe959bf295944f7def3daac7c9173795d5ed54b1df7052d7ebd3 DIST calligra-l10n...@valencia-2.9.6.tar.xz 371768 SHA256 2d2d0c3179795d99313e89c97e33696ac33325cdaf30a639adfd5416180aa1ec SHA512 bc81fa42f788ae02bf3679c8ae2f63390f227e24ecd2481402090d50f4820614d2f4f929763150737f1422d26cff5acd95eb56fd90c46867c7821
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-sources/
commit: 22169267321e2832af38f2d845d7f80dab7542b4 Author: Mike Pagano gentoo org> AuthorDate: Thu Sep 3 13:27:33 2015 + Commit: Mike Pagano gentoo org> CommitDate: Thu Sep 3 13:27:33 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22169267 sys-kernel/gentoo-sources: Remove old, unsupported versions. Package-Manager: portage-2.2.20.1 sys-kernel/gentoo-sources/Manifest | 55 -- .../gentoo-sources/gentoo-sources-3.10.83.ebuild | 30 .../gentoo-sources/gentoo-sources-3.10.85.ebuild | 30 .../gentoo-sources/gentoo-sources-3.10.86.ebuild | 30 .../gentoo-sources/gentoo-sources-3.14.49.ebuild | 29 .../gentoo-sources/gentoo-sources-3.14.50.ebuild | 29 .../gentoo-sources/gentoo-sources-3.18.18.ebuild | 29 .../gentoo-sources/gentoo-sources-3.18.19.ebuild | 29 .../gentoo-sources/gentoo-sources-3.4.106.ebuild | 29 .../gentoo-sources/gentoo-sources-4.0.6.ebuild | 29 .../gentoo-sources/gentoo-sources-4.0.7.ebuild | 29 .../gentoo-sources/gentoo-sources-4.0.8.ebuild | 29 .../gentoo-sources/gentoo-sources-4.1.0-r1.ebuild | 31 .../gentoo-sources/gentoo-sources-4.1.0.ebuild | 29 .../gentoo-sources/gentoo-sources-4.1.1-r1.ebuild | 31 .../gentoo-sources/gentoo-sources-4.1.2.ebuild | 31 .../gentoo-sources/gentoo-sources-4.1.3.ebuild | 31 .../gentoo-sources/gentoo-sources-4.1.4.ebuild | 31 .../gentoo-sources/gentoo-sources-4.1.5.ebuild | 31 19 files changed, 592 deletions(-) diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest index 82224c7..ece1321 100644 --- a/sys-kernel/gentoo-sources/Manifest +++ b/sys-kernel/gentoo-sources/Manifest @@ -3,25 +3,14 @@ DIST deblob-3.12 120320 SHA256 1d767acd3f461bcaa7ebef744dce1ca3eefde1cd41fde4c69 DIST deblob-3.14 121249 SHA256 980400e0db952ccdb5a507f99444330af893ed0f8a7a052916fcf0c2b2631f7e SHA512 2cbdf4f3947c12ade0931f0b3fb8b9c0312626a3bfea9d1c7d8d1d875b4673624ed3a6369653521998bbea0cde6730b573d6be918d052f1b553e093cb42a838f WHIRLPOOL 7ba1738ac829d8848104843da6237576f235c0151d53944ff3a7e0308cfb91600ffb9253402a34c2ed106c5b0bb3ce36785ead990396465341a957c58319221c DIST deblob-3.18 127087 SHA256 c720eabb3911f8dfa4398c4250853df4633018abebc01a509ee4a283c3e00941 SHA512 6fe33762ba19aad7ff891b7b805cc26f6e2926f5e40c92fa45bc7f31bdeb5c8fc42b97e5d37d71b9422da239c7c54abd25f1fa2fa1e5733c6053abbf4c9e9011 WHIRLPOOL c351a3ae15c59081fca69c1b5d9b9de10f024eb01f1426722a0d6ccb7caa34330be42897cd85cf19b22ff876352b0cec1c19707edc81c4cb01ad9c1df2e3d831 DIST deblob-4.0 129952 SHA256 c3d8e9a9728d5c1fc11b1112f5343b14e46a8cf2880e10399a840bc94b6e2ad3 SHA512 055205394487dbc0022f9531fb76d0be51ca3ec4e119232cc0972790d1532c680e1367eb36a9f40529f0ab1d76f64240b1e8a07cb02d3605d594c06e3547f1bb WHIRLPOOL db32b66231e552ac6e3651152eb2b3212ef0863842cd352bd2f1b1080b9ea5543f1f7ed0e7958a9f4b115559233dc1817560e896c789378ea7b68b527b721ca8 -DIST deblob-4.1 130695 SHA256 2888a5a3b5e8e9ec242e4d702582fa1d739a1274fcd94643a9fb3516a210a8a7 SHA512 b861b9b53f9295e5e993784031ce57cf8cddc418184ec00c28ed92c9e7660406e0ede581a93d0def36e7847b8e068c8ca6c4dfdd65c15cb174d6c5803c16214a WHIRLPOOL b90f55dd8702eb254968ed7689b50859833ed362e9aa1720ade96aa1f6f84e8f90f5d1eee034c8535e8bf767c0b5f8b0bc559219e8d81d4c6ed53bd5cfe5e65e DIST deblob-check-3.10 612122 SHA256 5a9552abac85cab9715a958785a3f901937fa135d85452647a16398181909c12 SHA512 c52917e9de8211f66a1e6805282dd727f1ec86701f76cbf16d0909ec212a9429c0994e0993db95b57934b17d9d91b08b4fa29f80c501397a5acce84bf4e1aed9 WHIRLPOOL d1c591fe7e229f9638945dd14f7dd16617ecff224b4cf2a6a3dd58913c23f7eb67496c26235d1d4637607bc9c9d260d990a0935b6b5bf2332f15e8ed58269856 DIST deblob-check-3.12 612300 SHA256 f29e34b141113ef9f71bf963b0e09bfe64e46db485ae1174bd212fed45a82ed3 SHA512 5835725eecbb9c23740e80bf5a6bb826bf49244e8a90b82ba3e2eaabeb8199aaceb1b63b8615f9e4770d846a5218eddcd091e7ec4568f74f963eb177051e8da5 WHIRLPOOL 615b95b11a9c9514c94a064e6b5019d36faae384c55ba30da1014ce3676731042939331074ccb3e7136458d54f3a5ad1f88aeb8ea45fb6310734c9f455ddb750 DIST deblob-check-3.14 613905 SHA256 4c69ea1c225b1a84c41e75392dcaa94f77dd8e647aff3afe52f1ab16ac99c5e5 SHA512 4dd7e785727ce29d78f5f68431fcb6ea9dfda5221dc8e699f40d13e3c85411707b13c288d23f8baa6b3c47f5a67ac58da0a7f1a51c4d9fdda82a7428ead88cf4 WHIRLPOOL de1b67955662f072193f58b7e7dbd98c6680958c2d65632bfb831dc0681945a4d1c27abe978e6ee687ae8f48773eb71c2f9026f461377b28235e7f7e39832a67 DIST deblob-check-3.18 654232 SHA256 30f22602b6ddf2cbccc16ef25fdc4d92755f3972e1c671d7cab8b9d6865eb155 SHA512 2cff9abef479a55dd6a0699371be8227ba63b18da1fb153d5df382e0a5e4f1b745b7de256a367a36efa9d12e2aad5622cc288efef009feebf81c108dbef4fe16 WHIRLPOOL e92927ad1565e80ce87e8bda372f8f7eb42b
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-beanutils/
commit: 09866463e9ba85619e7a4581caf49c8590b9b4d8 Author: Patrice Clement gentoo org> AuthorDate: Thu Sep 3 13:16:01 2015 + Commit: Patrice Clement gentoo org> CommitDate: Thu Sep 3 13:26:32 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09866463 dev-java/commons-beanutils: Disable yet another test that doesn't pass on ppc64. Package-Manager: portage-2.2.20.1 dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild index d137e11..c975c4a 100644 --- a/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild +++ b/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild @@ -38,6 +38,7 @@ JAVA_RM_FILES=( src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java src/test/java/org/apache/commons/beanutils/bugs/Jira422TestCase.java src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java + src/test/java/org/apache/commons/beanutils/DefaultIntrospectionContextTestCase.java ) EANT_GENTOO_CLASSPATH="commons-logging,commons-collections"
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-beanutils/
commit: 3c7f4a1c7d67bb58b89ace5665590c5ea059e50e
Author: Patrice Clement gentoo org>
AuthorDate: Thu Sep 3 13:18:32 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Sep 3 13:26:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c7f4a1c
dev-java/commons-beanutils: Stable for ppc64. Fixes security bug 534498.
Package-Manager: portage-2.2.20.1
dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
b/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
index c975c4a..c6f4fce 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
@@ -13,7 +13,7 @@
SRC_URI="mirror://apache/commons/beanutils/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="1.7"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
~x64-macos ~x86-macos"
IUSE=""
CDEPEND="dev-java/commons-collections:0
[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-beanutils/
commit: 7e7cdff1fcaa141d96c6723aef848cbb8a65e072
Author: Patrice Clement gentoo org>
AuthorDate: Thu Sep 3 13:20:17 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Sep 3 13:26:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e7cdff1
dev-java/commons-beanutils: Remove vunerable versions. Fixes security bug
534498.
Package-Manager: portage-2.2.20.1
dev-java/commons-beanutils/Manifest| 2 -
.../commons-beanutils-1.8.0.ebuild | 66 --
.../commons-beanutils-1.8.3.ebuild | 63 -
3 files changed, 131 deletions(-)
diff --git a/dev-java/commons-beanutils/Manifest
b/dev-java/commons-beanutils/Manifest
index c2da9d6..60a8008 100644
--- a/dev-java/commons-beanutils/Manifest
+++ b/dev-java/commons-beanutils/Manifest
@@ -1,3 +1 @@
-DIST commons-beanutils-1.8.0-src.tar.gz 379586 SHA256
aff3c8c772e4ff32f2d9a37a727a488583372e45535a3d5aad09662691851dcf SHA512
2a3ea0ff09b24517defcd9f15552b1820e87296b9d6f920732a81c3ab10ad927e247d787ba8bd60100dfd6ea15d6ee6933217ff57263eaa07ec6ea0f078a
WHIRLPOOL
88861f583317325275c72d10aebe104906d117ce4ce0d6cd079cacb2c3bde92a6b8419b87e317e5239cc0351fe3d29942b9e0d8afdb00e4bc86a377b6a35399a
-DIST commons-beanutils-1.8.3-src.tar.gz 383126 SHA256
df6d6a625db8da38b33d018030715130a258c0b493ea39f20c5e8d075b21b4ed SHA512
5cbe2774f097920db3b9dae99e7e6aa3c772826592c6f3b9db1ab9e3cc60631db60f0f9207c2f5335054288830085a6f0bf1da848300144c2a066b3a40e121b3
WHIRLPOOL
5ccf2ffab347db9d7276f64e7a293c1836699024c1fdb7321ec06f2cfd43d22a6e10938bb7637912ff22fe17417a534ac55266a16b81ef5fe85b9dfd0184fcab
DIST commons-beanutils-1.9.2-src.tar.gz 396910 SHA256
91fccad3b65f278bad98df1aa8467f2d3df6095f41b2db39d2c12863fb2c0049 SHA512
cf43aace33eb91368f86445874b16d977e827451f1355bb00e9b33bf0707855b5d757b0d58ad617f3a7f86f9065e7c900907dd604ba4de5ae61473d40cb758a9
WHIRLPOOL
e8d1628e09386a008415e493553438715092c76cd0237b6067659b80e4137959a0b585409d3273ceaeb6a5b72c1367b6a78a1b55f0856395388a615a0d1ac152
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.8.0.ebuild
b/dev-java/commons-beanutils/commons-beanutils-1.8.0.ebuild
deleted file mode 100644
index e8de4ae..000
--- a/dev-java/commons-beanutils/commons-beanutils-1.8.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Provides easy-to-use wrappers around Reflection and Introspection
APIs"
-HOMEPAGE="http://commons.apache.org/beanutils/";
-SRC_URI="mirror://apache/commons/beanutils/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.7"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
~x86-macos"
-IUSE=""
-
-COMMON_DEP="
- >=dev-java/commons-collections-2.1:0
- >=dev-java/commons-logging-1.0.2:0"
-RDEPEND=">=virtual/jre-1.4
- !<=dev-java/commons-betwixt-0.7-r1:0.7
- !dev-java/commons-beanutils-collections
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
- test? (
- dev-java/ant-junit
- dev-java/junit:0
- dev-java/commons-collections[test-framework]
- )
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${P}-src"
-
-java_prepare() {
- rm -vr src/java/org/apache/commons/collections/ || die
- # from pom.xml:
- #
- rm -v
./src/test/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java
|| die
- JAVA_ANT_CLASSPATH_TAGS="javac java" java-ant_rewrite-classpath
-}
-
-EANT_GENTOO_CLASSPATH="commons-logging,commons-collections"
-
-src_test() {
- EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit"
- ANT_TASKS="ant-junit" eant \
- -Dcommons-collections.jar=$(java-pkg_getjar commons-collections
commons-collections.jar) \
- -Dcommons-collections-testframework.jar=$(java-pkg_getjar
commons-collections commons-collections-testframework.jar) \
- -Dcommons-logging.jar=$(java-pkg_getjar commons-logging
commons-logging.jar) \
- test
-}
-
-src_install() {
- java-pkg_newjar dist/${P}.jar
- java-pkg_newjar dist/${PN}-core-${PV}.jar ${PN}-core.jar
- java-pkg_newjar dist/${PN}-bean-collections-${PV}.jar
${PN}-bean-collections.jar
-
- dodoc README.txt RELEASE-NOTES.txt || die
-
- use doc && java-pkg_dojavadoc dist/docs/api
- use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.8.3.ebuild
b/dev-java/commons-beanutils/commons-beanutils-1.8.3.ebuild
deleted file mode 100644
index e454634..000
--- a/dev-java/commons-beanutils/commons-beanutils-1.8.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-JAVA
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: 95e8eceb067dfafdf9f7b0cf62cfc8c6205e2453 Author: Patrice Clement gentoo org> AuthorDate: Thu Sep 3 13:50:57 2015 + Commit: Patrice Clement gentoo org> CommitDate: Thu Sep 3 13:50:57 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95e8eceb profiles: Clean up old entries in package.mask. Signed-off-by: Patrice Clement gentoo.org> profiles/package.mask | 15 --- 1 file changed, 15 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 149ce15..95df78d 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -192,27 +192,12 @@ dev-perl/gtk2-fu # Bugs: 478174, 546192, 556200. sys-apps/systemd-ui -# Patrice Clement (3 Aug 2015) -# Broken and no releases in 10 years (!). -# Removal in 30 days. See bug #451790. -www-servers/skunkweb - # Sergei Trofimovich (2 Aug 2015) # This package is a part of >=dev-lang/ghc-7.4. Gentoo # ebuilds use that. You can safely uninstall dev-haskell/deepseq # and fix leftovers with 'haskell-updater' run. dev-haskell/deepseq -# Patrice Clement (1 Aug 2015) -# Package relying on j2me. Not useful anymore since j2me has long been removed. -# Removal in 30 days. See bug #556460. -dev-java/antenna - -# Patrice Clement (30 Jul 2015) -# Broken and upstream dead isn't always a good mix. -# Removal in 30 days. See bug #368049. -dev-java/jjtraveler - # Pawel Hajdan, Jr. (28 Jul 2015) # Dev channel releases are only for people who are developers or want more # experimental features and accept a more unstable release.
[gentoo-commits] repo/gentoo:master commit in: dev-java/jjtraveler/, dev-java/jjtraveler/files/
commit: 0bda332c8a1a7b3570e33d43e666344554febdaa
Author: Patrice Clement gentoo org>
AuthorDate: Thu Sep 3 13:46:28 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Sep 3 13:47:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bda332c
dev-java/antenna: Package removal wrt bug 368049.
Signed-off-by: Patrice Clement gentoo.org>
dev-java/jjtraveler/Manifest | 1 -
dev-java/jjtraveler/files/0.4.3-makefile.am.patch | 20
dev-java/jjtraveler/jjtraveler-0.4.3-r2.ebuild| 59 ---
dev-java/jjtraveler/metadata.xml | 10
4 files changed, 90 deletions(-)
diff --git a/dev-java/jjtraveler/Manifest b/dev-java/jjtraveler/Manifest
deleted file mode 100644
index 5e89abb..000
--- a/dev-java/jjtraveler/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST JJTraveler-0.4.3.tar.gz 219594 SHA256
e873a57e59661b557bd73181c398c88efa1898dbb277df791cebc6ba6c8a1ad0 SHA512
fcaa2bbc736af95a0477f1d9a39d7d1410505c02214759baf3bed77b45d8bc9667cacbb7fdd954925038b6c67535bcf7af6c264347af18b150240d9796372c32
WHIRLPOOL
1ab5857492393843c7ba44024a165b8dd6a022c04a7a8e71ac3f02d98ac6e86b82c9b05efbfefd124a898a598eb80462606f3829d0a13027e6b6118ac902e94c
diff --git a/dev-java/jjtraveler/files/0.4.3-makefile.am.patch
b/dev-java/jjtraveler/files/0.4.3-makefile.am.patch
deleted file mode 100644
index a15e304..000
--- a/dev-java/jjtraveler/files/0.4.3-makefile.am.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ru JJTraveler-0.4.3-vanilla/Makefile.am
JJTraveler-0.4.3-patched/Makefile.am
JJTraveler-0.4.3-vanilla/Makefile.am 2004-04-14 08:55:45.0
-0400
-+++ JJTraveler-0.4.3-patched/Makefile.am 2007-02-26 09:12:28.0
-0500
-@@ -26,5 +26,4 @@
- noinst_SCRIPTS = ${PACKAGE}-${VERSION}.pkg
-
- ${PACKAGE}-${VERSION}.pkg: ${PACKAGE}.pkg Makefile
-- sed 's#__VERSION__#${VERSION}#g;\
-- s#__PACKAGE__#${PACKAGE}#g' < $< > $@
-+ sed 's#__VERSION__#${VERSION}#g;s#__PACKAGE__#${PACKAGE}#g' < $< > $@
-diff -ru JJTraveler-0.4.3-vanilla/scripts/Makefile.am
JJTraveler-0.4.3-patched/scripts/Makefile.am
JJTraveler-0.4.3-vanilla/scripts/Makefile.am 2004-02-02
10:12:10.0 -0500
-+++ JJTraveler-0.4.3-patched/scripts/Makefile.am 2007-02-26
09:11:03.0 -0500
-@@ -5,5 +5,4 @@
- EXTRA_DIST = jjtraveler-config.sh.src
-
- % : %.sh.src Makefile
-- sed 's@__PREFIX__@${prefix}@g;\
-- s@__VERSION__@${VERSION}@g;' < $< > $@ && chmod +x $@
-+ sed 's@__PREFIX__@${prefix}@g;s@__VERSION__@${VERSION}@g;' < $< > $@ &&
chmod +x $@
diff --git a/dev-java/jjtraveler/jjtraveler-0.4.3-r2.ebuild
b/dev-java/jjtraveler/jjtraveler-0.4.3-r2.ebuild
deleted file mode 100644
index 665943d..000
--- a/dev-java/jjtraveler/jjtraveler-0.4.3-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="source doc"
-
-inherit autotools java-pkg-2
-
-DESCRIPTION="A visitor combinator framework for Java"
-HOMEPAGE="http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATermLibrary";
-MY_P=JJTraveler-${PV}
-SRC_URI="http://www.cwi.nl/projects/MetaEnv/jjtraveler/${MY_P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-S=${WORKDIR}/${MY_P}
-
-DEPEND="
- >=virtual/jdk-1.4
- =dev-java/junit-3.8*"
-RDEPEND=">=virtual/jre-1.4
- =dev-java/junit-3.8*"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/0.4.3-makefile.am.patch"
- eautoreconf
-
- (
- echo "#!/bin/sh"
- echo "java-config -p ${PN}"
- ) > "${S}/jjtraveler-config"
-
- rm -v jars/*.jar || die
- cd jars
- java-pkg_jar-from junit
-}
-
-src_compile() {
- econf \
- --with-javac-flags="$(java-pkg_javac-args)"
- emake || die "emake failed"
- if use doc; then
- cd src/jjtraveler
- make htmljava.stamp || die "Failed to create javadoc"
- fi
-}
-
-src_install() {
- java-pkg_newjar ./src/${P}.jar
-
- dobin jjtraveler-config || die
- dodoc AUTHORS ChangeLog NEWS README TODO || die
-
- use source && java-pkg_dosrc src/jjtraveler
- use doc && java-pkg_dojavadoc src/jjtraveler/doc
-}
diff --git a/dev-java/jjtraveler/metadata.xml b/dev-java/jjtraveler/metadata.xml
deleted file mode 100644
index 1fa958f..000
--- a/dev-java/jjtraveler/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-
-java
-
-
-JJTraveler: a visitor combinator framework for Java.
-
-
[gentoo-commits] repo/gentoo:master commit in: www-servers/skunkweb/, www-servers/skunkweb/files/
commit: 2dc83148270e0470c0a9333d538800cd6f8bbcaf
Author: Patrice Clement gentoo org>
AuthorDate: Thu Sep 3 13:52:51 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Sep 3 13:52:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dc83148
www-servers/skunkweb: Package removal wrt bug 451790.
Signed-off-by: Patrice Clement gentoo.org>
www-servers/skunkweb/Manifest | 1 -
www-servers/skunkweb/files/100_mod_skunkweb.conf | 50 --
.../skunkweb/files/skunkweb-cron-cache_cleaner | 4 --
www-servers/skunkweb/files/skunkweb-init | 21 --
www-servers/skunkweb/metadata.xml | 14
www-servers/skunkweb/skunkweb-3.4.4.ebuild | 80 --
6 files changed, 170 deletions(-)
diff --git a/www-servers/skunkweb/Manifest b/www-servers/skunkweb/Manifest
deleted file mode 100644
index 5b04d02..000
--- a/www-servers/skunkweb/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST skunkweb-3.4.4.tar.gz 1411045 SHA256
a7f0bc47788cdb01882d53f433599fc1837013f45b7d13ea67d60a81f8c6f1e0
diff --git a/www-servers/skunkweb/files/100_mod_skunkweb.conf
b/www-servers/skunkweb/files/100_mod_skunkweb.conf
deleted file mode 100644
index 032..000
--- a/www-servers/skunkweb/files/100_mod_skunkweb.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
- LoadModule skunkweb_module modules/mod_skunkweb.so
-
-
- # This tells apache to call our module for EVERY request
-
- SetHandler skunkweb-handler
-
-
- # Socket address of SkunkWeb. Either a path to a unix domain socket or
- # a host:port pair for a TCP socket
- SkunkWebSocketAddress localhost:9888
-
- # Number of times to retry accessing the SkunkWeb
- SkunkWebRetries 3
-
- # The location of the error page which gets displayed when SkunkWeb is
- # not accessible
- SkunkWebErrorDoc /usr/share/skunkweb/share/skunk/modskunkweb_error.html
-
- # The list of users to receive critical error emails. Should be a list
- # of space separated entries
- SkunkWebErrorEmails root@localhost
-
- # List of uri prefixes for which should be handled in the normal way by
- # apache and *not* by SkunkWeb.
- #
- # THIS OPTION IS NO LONGER SUPPORTED UNDER APACHE 2 AND MAY GO AWAY FOR
- # APACHE 1.x AS YOU CAN DO THE SAME THING VIA directives
- #
- # SkunkWebExclude /foo/ /bar/
-
- # In the event that we cannot reach a server running on
SkunkWebSocketAddress,
- # randomly pick socketaddresses from the following list and try to
connect to
- # them instead until we run out of retries (set by SkunkWebRetries).
- #
- # SkunkWebFailoverHosts unixsocketaddr otherhost2:port
-
- # The number of milliseconds we should wait attempting to connect
before
- # bailing out retrying, since otherwise, we'd wait the default amount
for TCP
- # which is 2 minutes -- BLEAH! (default is 1 second = 1000
milliseconds)
- #
- # SkunkWebConnectTimeout 1000
-
- # Whether or not to include SkunkWeb/ in the Server header of
Apache
- # Default is On
- # SkunkWebExpose On
-
diff --git a/www-servers/skunkweb/files/skunkweb-cron-cache_cleaner
b/www-servers/skunkweb/files/skunkweb-cron-cache_cleaner
deleted file mode 100644
index 0ac9bdf..000
--- a/www-servers/skunkweb/files/skunkweb-cron-cache_cleaner
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/sh
-
-nice -n 5 /usr/share/skunkweb/util/cache_reaper.py -c /var/lib/skunkweb/cache
> /dev/null 2>&1
-
diff --git a/www-servers/skunkweb/files/skunkweb-init
b/www-servers/skunkweb/files/skunkweb-init
deleted file mode 100644
index c32cc0f..000
--- a/www-servers/skunkweb/files/skunkweb-init
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Id$
-
-DAEMON_CMD=/usr/bin/swmgr
-opts="${opts} configtest"
-
-configtest() {
- ${DAEMON_CMD} configtest
-}
-start() {
- ebegin "Starting skunkweb"
- ${DAEMON_CMD} start > /dev/null 2>&1
- eend $?
-}
-stop() {
- ebegin "Stopping skunkweb"
- ${DAEMON_CMD} stop > /dev/null 2>&1
- eend $?
-}
diff --git a/www-servers/skunkweb/metadata.xml
b/www-servers/skunkweb/metadata.xml
deleted file mode 100644
index 52dd098..000
--- a/www-servers/skunkweb/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
- python
-
- SkunkWeb is a multi-process application server written in
python,
- extensively using 'pickle' for caching. Ships with its own web
server,
- or can be deployed with apache and mod-python. Includes
server-side form
- management libraries (docs in cvs).
-
-
-
[gentoo-commits] repo/gentoo:master commit in: dev-java/antenna/files/, dev-java/antenna/
commit: b4215f48cf2db00fe0d3db0f58cb0f63dc28522d
Author: Patrice Clement gentoo org>
AuthorDate: Thu Sep 3 13:45:07 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Sep 3 13:47:39 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4215f48
dev-java/antenna: Package removal wrt bug 556460.
Signed-off-by: Patrice Clement gentoo.org>
dev-java/antenna/Manifest | 1 -
dev-java/antenna/antenna-1.0.2-r1.ebuild| 68 ---
dev-java/antenna/antenna-1.0.2-r2.ebuild| 67 ---
dev-java/antenna/files/antenna-0.9.13-ant.patch | 107
dev-java/antenna/metadata.xml | 8 --
5 files changed, 251 deletions(-)
diff --git a/dev-java/antenna/Manifest b/dev-java/antenna/Manifest
deleted file mode 100644
index a6ae0ae..000
--- a/dev-java/antenna/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST antenna-src-1.0.2.zip 1502020 SHA256
a6a15d257ae2af8805cf002e51675246b119cb34f23bf3cc15398acaca0bcfe8 SHA512
38ff589b82f2298e17846b2437981ffe549e35129624b36f439bfeb9943fe5a6577ef2ec4aba7314f59c8c4f30fb8c45cd6e3c675af0196ac4248a4d256e48d7
WHIRLPOOL
e1d958ac110e5f97caad2160df3e6cd019640a5ed36697f373115b8850cdbd8ac5d070860a5dea476d31baf6bd484a13282b5aba9c1380a0805a888e23b095d5
diff --git a/dev-java/antenna/antenna-1.0.2-r1.ebuild
b/dev-java/antenna/antenna-1.0.2-r1.ebuild
deleted file mode 100644
index 17a28ab..000
--- a/dev-java/antenna/antenna-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_P=${DISTDIR}/${PN}-src-${PV}.zip
-
-DESCRIPTION="Ant task for J2ME"
-HOMEPAGE="http://antenna.sourceforge.net/";
-SRC_URI="mirror://sourceforge/antenna/${PN}-src-${PV}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/ant-core:0
- dev-java/antlr:0
- java-virtuals/servlet-api:2.4"
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip
- ${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-
-S="${WORKDIR}"
-
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
- default
- unzip -n lib/preprocessor-src-1.1.zip
-}
-
-java_prepare() {
- rm -rf lib
- java-ant_bsfix_one build.xml
- java-ant_rewrite-classpath build.xml
-}
-
-src_compile() {
- local cp="ant-core,antlr,servlet-api-2.4"
- EANT_GENTOO_CLASSPATH="${cp}" \
- EANT_BUILD_TARGET="init compile package" \
- EANT_DOC_TARGET="" java-pkg-2_src_compile
- if use doc; then
- javadoc -encoding latin1 -d api $(find src -name "*.java") \
- -classpath $(java-pkg_getjars "${cp}") \
- || die "javadoc failed"
- fi
-}
-
-src_install() {
- java-pkg_newjar dist/${PN}-bin-${PV}.jar
- java-pkg_register-ant-task
-
- if use doc; then
- java-pkg_dohtml doc/*
- java-pkg_dojavadoc api
- fi
- use source && java-pkg_dosrc src/*
- use examples && java-pkg_doexamples samples
-}
diff --git a/dev-java/antenna/antenna-1.0.2-r2.ebuild
b/dev-java/antenna/antenna-1.0.2-r2.ebuild
deleted file mode 100644
index 4765b98..000
--- a/dev-java/antenna/antenna-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_P=${DISTDIR}/${PN}-src-${PV}.zip
-
-DESCRIPTION="Ant task for J2ME"
-HOMEPAGE="http://antenna.sourceforge.net/";
-SRC_URI="mirror://sourceforge/antenna/${PN}-src-${PV}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/ant-core:0
- dev-java/antlr:0
- java-virtuals/servlet-api:3.0"
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip
- ${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-
-S="${WORKDIR}"
-
-JAVA_PKG_BSFIX="off"
-
-java_prepare() {
- unzip -n lib/preprocessor-src-1.1.zip || die "can't unzip
preprocessor-src-1.1.zip"
- rm -rf lib || die "can't remove lib directory"
-
- java-ant_bsfix_one build.xml
- java-ant_rewrite-classpath build.xml
-}
-
-src_compile() {
- local cp="ant-core,antlr,servlet-api-3.0"
-
- EANT_GENTOO_CLASSPATH="${cp}" \
- EANT_BUILD_TARGET="init compile package" \
- EANT_DOC_TARGET="" java-pkg-2_src_compile
-
- if use doc; then
- javadoc -encoding latin1 -d api $(find src -name "*.java") \
- -classpath $(java-pkg_getjars "${cp}") \
- || die "javadoc failed"
- fi
-}
-
-src_install() {
- java-pkg_newjar dist/${PN}-bin-${PV}.jar
- java-pkg_register-ant-
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/
commit: b5c632a81fc9457bd1af77f07c87961deb888bb2 Author: Andrey Grozin gentoo org> AuthorDate: Thu Sep 3 14:22:01 2015 + Commit: Andrey Grozin gentoo org> CommitDate: Thu Sep 3 14:22:01 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5c632a8 sci-mathematics/maxima: version bump Package-Manager: portage-2.2.20.1 sci-mathematics/maxima/Manifest| 1 + sci-mathematics/maxima/files/clisp-1.patch | 19 +++ sci-mathematics/maxima/files/clozurecl-2.patch | 27 sci-mathematics/maxima/files/cmucl-1.patch | 19 +++ sci-mathematics/maxima/files/ecls-2.patch | 35 + sci-mathematics/maxima/files/sbcl-1.patch | 18 +++ sci-mathematics/maxima/maxima-5.37.1.ebuild| 190 + 7 files changed, 309 insertions(+) diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest index 221c53c..edee4ea 100644 --- a/sci-mathematics/maxima/Manifest +++ b/sci-mathematics/maxima/Manifest @@ -1,2 +1,3 @@ DIST maxima-5.34.1.tar.gz 29469851 SHA256 20ca416ca912c8d3d99299f2ef45342a1beb2f077cf501c6a647de46bfdb89b7 SHA512 24a9ce0d2bfb0fa107460bbeec561869f9d3f2ce2623e39ab16b810dbf2712981bbf98ceee9c30f4e70fdec7f918a7743b5fb8cf26b67313e1d367dd8f2a1823 WHIRLPOOL 0f59cfe14391686a543027bb5cab8669439d0e36b016924872662f61e36cf05663480f8a3f942d7deccbe39ec7f45ed77deeb8a3c84241189ac0f1993537c47a DIST maxima-5.36.1.tar.gz 29615673 SHA256 400bf83000b84d280d75e200e078582fe44f23220824562cc06c589d8a993974 SHA512 10e090230ab408777a1145ad90daef6bf237ba38ae31a654ba4d464e7a27e1f48baac5202ce8fb39e4c04ec9a6c9916ac83a58bd071b676ea5a989ea7db87d4c WHIRLPOOL ee7738085ae9e5b156b89afbf724b3ae5ef70b74550bee43cf3ab763f569d5ac51ea9c0e5aad67070f4b71f480b079aad8e4fd44ded34525a1f84cbeeb2d28b0 +DIST maxima-5.37.1.tar.gz 29952404 SHA256 511477cbdf4645a6abd49596d59ed449ec8e012f90b59b1ddffc783c697bf744 SHA512 523f2768e18e7e368dee63f5f6350afc87c3f5a51ef317b1bf3d9c662c1326a40a5035c09c44ed2e1388d31b5450802b802088e95dc7a3e10343bc55daefd878 WHIRLPOOL 0d7fad832a145d38fc0106540ba17d270da64495b2c739c215c07fcefeba2ecb769e609a2e7c1dd516e58b8e128776f5365bf10273c5031f5750b5c250d78bc2 diff --git a/sci-mathematics/maxima/files/clisp-1.patch b/sci-mathematics/maxima/files/clisp-1.patch new file mode 100644 index 000..9dc8dfd --- /dev/null +++ b/sci-mathematics/maxima/files/clisp-1.patch @@ -0,0 +1,19 @@ +diff -r -U1 maxima-5.37.1.orig/src/maxima.in maxima-5.37.1/src/maxima.in +--- maxima-5.37.1.orig/src/maxima.in 2015-05-22 04:40:03.0 +0600 maxima-5.37.1/src/maxima.in2015-09-03 16:08:22.467930422 +0600 +@@ -135,5 +135,5 @@ + if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then +-exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -q "" -- "$@" ++exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -q -norc "" -- "$@" + else +- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$@" ++ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$@" + fi +@@ -141,5 +141,5 @@ + if [ -x "$maxima_image_base" ]; then +-exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -q "" -- "$@" ++exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -q -norc "" -- "$@" + else +- exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$@" ++ exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$@" + fi diff --git a/sci-mathematics/maxima/files/clozurecl-2.patch b/sci-mathematics/maxima/files/clozurecl-2.patch new file mode 100644 index 000..5c5189c --- /dev/null +++ b/sci-mathematics/maxima/files/clozurecl-2.patch @@ -0,0 +1,27 @@ +diff -r -U1 maxima-5.37.1.orig/configure.ac maxima-5.37.1/configure.ac +--- maxima-5.37.1.orig/configure.ac2015-09-01 02:28:02.0 +0600 maxima-5.37.1/configure.ac 2015-09-03 18:11:54.335618720 +0600 +@@ -386,3 +386,3 @@ + dnl n.b. openmcl_default_name is hardcoded in "with" message +-openmcl_default_name=openmcl ++openmcl_default_name=ccl + AC_ARG_ENABLE(openmcl, +diff -r -U1 maxima-5.37.1.orig/src/Makefile.am maxima-5.37.1/src/Makefile.am +--- maxima-5.37.1.orig/src/Makefile.am 2015-08-11 02:44:21.0 +0600 maxima-5.37.1/src/Makefile.am 2015-09-03 17:26:12.849734012 +0600 +@@ -338,3 +338,3 @@ + +-EXECUTEOPENMCL = $(OPENMCL_NAME) -e ++EXECUTEOPENMCL = $(OPENMCL_NAME) --no-init -e + BUILT_FILES += $(OPENMCL_MAXIMA) +diff -r -U1 maxima-5.37.1.orig/src/maxima.in maxima-5.37.1/src/maxima.in +--- maxima-5.37.1.orig/src/maxima.in 2015-05-22 04:40:03.0 +0600 maxima-5.37.1/src/maxima.in2015-09-03 17:22:31.841743306 +0600 +@@ -182,5 +182,5 @@ + if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then +- exec "$M
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/nova/
commit: a691cc7ccf2c222866ec5d64c05221f8fd5ba0bb
Author: Matthew Thode mthode org>
AuthorDate: Thu Sep 3 14:27:20 2015 +
Commit: Matt Thode gentoo org>
CommitDate: Thu Sep 3 14:28:19 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a691cc7c
sys-cluster/nova: cleaning up for bug 559376
Package-Manager: portage-2.2.20.1
sys-cluster/nova/nova-2015.1.1-r2.ebuild | 253 ---
1 file changed, 253 deletions(-)
diff --git a/sys-cluster/nova/nova-2015.1.1-r2.ebuild
b/sys-cluster/nova/nova-2015.1.1-r2.ebuild
deleted file mode 100644
index 2629472..000
--- a/sys-cluster/nova/nova-2015.1.1-r2.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils linux-info multilib user
-
-DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system)
written in Python"
-HOMEPAGE="https://launchpad.net/nova";
-SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz";
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+compute compute-only iscsi +kvm +memcached mysql +novncproxy
openvswitch postgres +rabbitmq sqlite test xen"
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
- compute-only? ( compute
!rabbitmq !memcached !mysql !postgres !sqlite )
- compute? ( ^^ ( kvm xen ) )"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/pbr-0.8[${PYTHON_USEDEP}]
- =dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
- =dev-python/coverage-3.6[${PYTHON_USEDEP}]
- >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
- =dev-python/mock-1.0[${PYTHON_USEDEP}]
- =dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
- =dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
- =dev-python/python-ironicclient-0.4.1[${PYTHON_USEDEP}]
- =dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
- =dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
- =dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
- =dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
- !~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
- =dev-python/suds-0.4[${PYTHON_USEDEP}]
- >=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
-
[gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/
commit: 09c67e49adc22ec8cd4ec79e91eb38fb12a02ffa
Author: Patrice Clement gentoo org>
AuthorDate: Thu Sep 3 14:04:59 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Sep 3 14:30:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09c67e49
dev-java/easymock: Keyword for ppc+ppc64. Fixes bug 538380.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement gentoo.org>
dev-java/easymock/easymock-3.2-r1.ebuild | 2 +-
dev-java/easymock/easymock-3.3.1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/easymock/easymock-3.2-r1.ebuild
b/dev-java/easymock/easymock-3.2-r1.ebuild
index 4f1e6c5..cbefa0d 100644
--- a/dev-java/easymock/easymock-3.2-r1.ebuild
+++ b/dev-java/easymock/easymock-3.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/EasyMock/${PV}/${P}.zip"
LICENSE="|| ( MIT Apache-2.0 )"
SLOT="3.2"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~ppc ~ppc64"
IUSE=""
CDEPEND="dev-java/junit:4
diff --git a/dev-java/easymock/easymock-3.3.1.ebuild
b/dev-java/easymock/easymock-3.3.1.ebuild
index 9625ed7..446f885 100644
--- a/dev-java/easymock/easymock-3.3.1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/EasyMock/${PV}/${P}.zip"
LICENSE="|| ( MIT Apache-2.0 )"
SLOT="3.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
IUSE=""
COMMON_DEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-libs/devil/, media-libs/devil/files/
commit: bbec455c85cfdd85ae529cc407ede34277127c91
Author: Michael Sterrett gentoo org>
AuthorDate: Thu Sep 3 15:01:03 2015 +
Commit: Michael Sterrett gentoo org>
CommitDate: Thu Sep 3 15:06:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbec455c
fix building with gcc-5.2 with patch from Sven Eden via bug 552370
Package-Manager: portage-2.2.20.1
media-libs/devil/devil-1.7.8-r2.ebuild| 2 +-
media-libs/devil/files/devil-1.7.8-restrict.patch | 23 +++
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild
b/media-libs/devil/devil-1.7.8-r2.ebuild
index 1f03c57..8be0281 100644
--- a/media-libs/devil/devil-1.7.8-r2.ebuild
+++ b/media-libs/devil/devil-1.7.8-r2.ebuild
@@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
X? ( x11-proto/xextproto )"
src_prepare() {
- epatch "${FILESDIR}"/${P}-{CVE-2009-3994,libpng14,nvtt-glut,ILUT}.patch
+ epatch
"${FILESDIR}"/${P}-{CVE-2009-3994,libpng14,nvtt-glut,ILUT,restrict}.patch
eautoreconf
}
diff --git a/media-libs/devil/files/devil-1.7.8-restrict.patch
b/media-libs/devil/files/devil-1.7.8-restrict.patch
new file mode 100644
index 000..d99ccb3
--- /dev/null
+++ b/media-libs/devil/files/devil-1.7.8-restrict.patch
@@ -0,0 +1,23 @@
+Patch from Sven Eden via bug 552370
+https://bugs.gentoo.org/show_bug.cgi?id=552370
+
+--- a/include/IL/il.h 2009-03-08 08:10:08.0 +0100
b/include/IL/il.h 2015-09-03 16:22:04.056637044 +0200
+@@ -63,13 +63,13 @@
+ #endif
+ #endif
+
+-#ifdef RESTRICT_KEYWORD
+-#define RESTRICT restrict
+-#define CONST_RESTRICT const restrict
++#if defined(RESTRICT_KEYWORD) && !defined(__cplusplus)
++#define RESTRICT __restrict__
++#define CONST_RESTRICT const __restrict__
+ #else
+ #define RESTRICT
+ #define CONST_RESTRICT const
+-#endif
++#endif // RESTRICT keyword and not C++
+
+ #include
+
[gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
commit: 99fc43024db4be08fbfbff3a6a79c90db920e927 Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Tue Sep 1 19:40:15 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Tue Sep 1 19:40:15 2015 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=99fc4302 drop --selinux switch from tar tar --selinux isn't support unless you are on selinux, and in that case things are still not likely to be right do to the dark magic that is selinux. >From the head of the selinux team: <@SwifT> Zero_Chaos: let's not use tar --selinux right now until we have updated catalyst to create selinux-enabled chroots catalyst/base/stagebase.py | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 6adc3b9..25e5b6c 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -696,10 +696,10 @@ class StageBase(TargetBase, ClearBase, GenBase): self.settings["chroot_path"]+\ " (This may take some time) ...\n" if "bz2" == self.settings["chroot_path"][-3:]: - unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ + unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ self.settings["chroot_path"] else: - unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ + unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ self.settings["chroot_path"] error_msg="Tarball extraction of "+\ self.settings["source_path"]+" to "+\ @@ -711,10 +711,10 @@ class StageBase(TargetBase, ClearBase, GenBase): self.settings["chroot_path"]+\ " (This may take some time) ...\n" if "bz2" == self.settings["chroot_path"][-3:]: - unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ + unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ self.settings["chroot_path"] else: - unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ + unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ self.settings["chroot_path"] error_msg="Tarball extraction of "+self.settings["source_path"]+\ " to "+self.settings["chroot_path"]+" failed." @@ -806,9 +806,9 @@ class StageBase(TargetBase, ClearBase, GenBase): "catalyst-hash") destdir=self.settings["snapshot_cache_path"] if "bz2" == self.settings["chroot_path"][-3:]: - unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir + unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir else: - unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir + unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags -xpf "+self.settings["snapshot_path"]+" -C "+destdir unpack_errmsg="Error unpacking snapshot" cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\ self.settings["snapshot_cache_path"]+\ @@ -825,10 +
[gentoo-commits] proj/catalyst:pending commit in: targets/support/
commit: 44919839b30fff5176e5c261340baf6af173c033
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Thu Sep 3 01:47:28 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Sep 3 01:47:28 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=44919839
scratch that, tinderbox does not run cleanup
targets/support/chroot-functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/targets/support/chroot-functions.sh
b/targets/support/chroot-functions.sh
index 2986ae7..b8ab8d2 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -234,7 +234,7 @@ cleanup_stages() {
# Remove bindist from use
sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
- [ "${clst_target}" != "tinderbox" ] && rm -f /var/log/emerge.log
/var/log/portage/elog/*
+ rm -f /var/log/emerge.log /var/log/portage/elog/*
}
update_env_settings(){
[gentoo-commits] proj/catalyst:pending commit in: catalyst/
commit: 6428baba7e9f7aa6fc4ede457804adbe793c3ac4 Author: Brian Dolbec gentoo org> AuthorDate: Sun May 24 07:38:32 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Sep 3 15:09:02 2015 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6428baba catalyst/main.py: Comment out the try: except: pair for target.run() catalyst/main.py | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/catalyst/main.py b/catalyst/main.py index 0ba81b9..7e3b55e 100644 --- a/catalyst/main.py +++ b/catalyst/main.py @@ -163,12 +163,12 @@ def build_target(addlargs): "Target \"%s\" not available." % target, print_traceback=True) - try: - target.run() - except: - print "!!! catalyst: Error encountered during run of target " + \ - addlargs["target"] - sys.exit(1) + #try: + target.run() + #except: + #print "!!! catalyst: Error encountered during run of target " + \ + # addlargs["target"] + #sys.exit(1) def main():
[gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
commit: 827a9cd7ea1863242920651752a8265acc8d57ad
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Wed Sep 2 21:52:48 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Wed Sep 2 21:52:48 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=827a9cd7
support setting/overriding fcflags and fflags, specifically for use with
CFLAGS=-frecord-gcc-switches
catalyst/base/stagebase.py | 26 +-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 23491aa..d898e95 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -38,7 +38,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.valid_values.extend(["version_stamp","target","subarch",\
"rel_type","profile","snapshot","source_subpath","portage_confdir",\
-
"cflags","cxxflags","ldflags","cbuild","hostuse","portage_overlay",\
+
"cflags","cxxflags","fcflags","fflags","ldflags","cbuild","hostuse","portage_overlay",\
"distcc_hosts","makeopts","pkgcache_path","kerncache_path"])
self.set_valid_build_kernel_vars(addlargs)
@@ -280,6 +280,14 @@ class StageBase(TargetBase, ClearBase, GenBase):
if "CXXFLAGS" in self.makeconf:
self.settings["CXXFLAGS"]=self.makeconf["CXXFLAGS"]
+ def override_fcflags(self):
+ if "FCFLAGS" in self.makeconf:
+ self.settings["FCFLAGS"]=self.makeconf["FCFLAGS"]
+
+ def override_fflags(self):
+ if "FFLAGS" in self.makeconf:
+ self.settings["FFLAGS"]=self.makeconf["FFLAGS"]
+
def override_ldflags(self):
if "LDFLAGS" in self.makeconf:
self.settings["LDFLAGS"]=self.makeconf["LDFLAGS"]
@@ -1020,6 +1028,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.override_chost()
self.override_cflags()
self.override_cxxflags()
+ self.override_fcflags()
+ self.override_fflags()
self.override_ldflags()
if "autoresume" in self.settings["options"] \
and self.resume.is_enabled("chroot_setup"):
@@ -1077,6 +1087,20 @@ class StageBase(TargetBase, ClearBase, GenBase):
myf.write('CXXFLAGS="${CFLAGS}"\n')
else:
myf.write('CXXFLAGS="${CFLAGS}"\n')
+ if "FCFLAGS" in self.settings:
+ if
self.settings["FCFLAGS"]!=self.settings["CFLAGS"]:
+
myf.write('FCFLAGS="'+self.settings["FCFLAGS"]+'"\n')
+ else:
+ myf.write('FCFLAGS="${CFLAGS}"\n')
+ else:
+ myf.write('FCFLAGS="${CFLAGS}"\n')
+ if "FFLAGS" in self.settings:
+ if
self.settings["FFLAGS"]!=self.settings["CFLAGS"]:
+
myf.write('FFLAGS="'+self.settings["FFLAGS"]+'"\n')
+ else:
+ myf.write('FFLAGS="${CFLAGS}"\n')
+ else:
+ myf.write('FFLAGS="${CFLAGS}"\n')
if "LDFLAGS" in self.settings:
myf.write("# LDFLAGS is unsupported. USE AT
YOUR OWN RISK!\n")
[gentoo-commits] proj/catalyst:pending commit in: catalyst/base/, catalyst/targets/, etc/, examples/, catalyst/
commit: e1beae5aee64b474b73a68c790b612c732c0b835
Author: Brian Dolbec gentoo org>
AuthorDate: Sun May 24 07:36:49 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Sep 3 15:09:02 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e1beae5a
apply new compress code, normalize paths
catalyst/base/stagebase.py | 171 +++
catalyst/defaults.py | 4 +
catalyst/main.py | 8 ++
catalyst/targets/grp.py | 2 +-
catalyst/targets/livecd_stage1.py| 2 +-
catalyst/targets/livecd_stage2.py| 6 +-
catalyst/targets/netboot.py | 8 +-
catalyst/targets/netboot2.py | 2 +-
catalyst/targets/stage2.py | 8 +-
etc/catalyst.conf| 11 ++-
examples/generic_stage_template.spec | 32 ++-
11 files changed, 159 insertions(+), 95 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index d898e95..aba330e 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -10,6 +10,8 @@ from stat import ST_UID, ST_GID, ST_MODE
# for convienience
pjoin = os.path.join
+from decomp.compress import CompressMap
+
from catalyst.defaults import (SOURCE_MOUNT_DEFAULTS, TARGET_MOUNT_DEFAULTS,
PORT_LOGDIR_CLEAN)
from catalyst.support import (CatalystError, msg, file_locate, normpath,
@@ -264,6 +266,14 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.env["PORT_LOGDIR"] = self.settings["port_logdir"]
self.env["PORT_LOGDIR_CLEAN"] = PORT_LOGDIR_CLEAN
+ # Initialize our (de)compressor's)
+ self.decompressor =
CompressMap(self.settings["decompress_definitions"],
+ env=self.env,
+ search_order=self.settings["decompressor_search_order"])
+
+ # save resources, it is not always needed
+ self.compressor = None
+
def override_cbuild(self):
if "CBUILD" in self.makeconf:
self.settings["CBUILD"]=self.makeconf["CBUILD"]
@@ -332,11 +342,11 @@ class StageBase(TargetBase, ClearBase, GenBase):
normpath(self.settings["kerncache_path"])
else:
self.settings["kerncache_path"]=normpath(self.settings["storedir"]+\
-
"/kerncache/"+self.settings["target_subpath"]+"/")
+ "/kerncache/"+self.settings["target_subpath"])
def set_target_path(self):
self.settings["target_path"]=normpath(self.settings["storedir"]+\
-
"/builds/"+self.settings["target_subpath"].rstrip('/')+".tar.bz2")
+ "/builds/"+self.settings["target_subpath"])
if "autoresume" in self.settings["options"]\
and self.resume.is_enabled("setup_target_path"):
print \
@@ -420,7 +430,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
"/tmp/" + self.settings["source_subpath"] + "/")
else:
self.settings["source_path"]=normpath(self.settings["storedir"]+\
-
"/builds/"+self.settings["source_subpath"].rstrip('/')+".tar.bz2")
+ "/builds/"+self.settings["source_subpath"])
if os.path.isfile(self.settings["source_path"]):
# XXX: Is this even necessary if the previous
check passes?
if os.path.exists(self.settings["source_path"]):
@@ -435,7 +445,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
print "\tseedcache in the options of catalyst.conf the
source path"
print "\twill then be "+\
normpath(self.settings["storedir"]+"/builds/"+\
-
self.settings["source_subpath"].rstrip('/')+".tar.bz2\n")
+ self.settings["source_subpath"]+"\n")
def set_dest_path(self):
if "root_path" in self.settings:
@@ -462,7 +472,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
else:
self.settings["snapshot_path"]=normpath(self.settings["storedir"]+\
"/snapshots/" + self.settings["snapshot_name"] +
-
self.settings["snapshot"].rstrip('/')+".tar.bz2")
+ self.settings["snapshot"])
if os.path.exists(self.settings["snapshot_path"]):
self.settings["snapshot_path_hash"] = \
@@ -472,6 +482,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
verbose = False)
def set_snapca
[gentoo-commits] proj/catalyst:pending commit in: targets/embedded/
commit: 182ea27a454746f256b04991aeb6f710b8c90a91
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Thu Sep 3 01:53:08 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Sep 3 01:53:08 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=182ea27a
run setup_pkgmgr to setup portage and use flags properly for embedded target
targets/embedded/embedded-chroot.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/targets/embedded/embedded-chroot.sh
b/targets/embedded/embedded-chroot.sh
index 2fbba27..56d40a4 100755
--- a/targets/embedded/embedded-chroot.sh
+++ b/targets/embedded/embedded-chroot.sh
@@ -6,6 +6,8 @@ source /tmp/chroot-functions.sh
export DESTROOT="${clst_root_path}"
export clst_root_path="/"
+setup_pkgmgr
+
echo "Installing dependencies into ${DESTROOT}..."
run_merge -o "${clst_embedded_packages}"
[gentoo-commits] proj/catalyst:pending commit in: targets/tinderbox/, targets/support/
commit: 4aad35c671e5d70207e3c7ac879abf70770114b6
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Thu Sep 3 01:55:33 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Sep 3 01:55:33 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4aad35c6
make tinderbox use cleanup stage, modify cleanup stage to not wipe logs for
tinderbox target
targets/support/chroot-functions.sh| 2 +-
targets/tinderbox/tinderbox-preclean-chroot.sh | 10 +-
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/targets/support/chroot-functions.sh
b/targets/support/chroot-functions.sh
index b8ab8d2..2986ae7 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -234,7 +234,7 @@ cleanup_stages() {
# Remove bindist from use
sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
- rm -f /var/log/emerge.log /var/log/portage/elog/*
+ [ "${clst_target}" != "tinderbox" ] && rm -f /var/log/emerge.log
/var/log/portage/elog/*
}
update_env_settings(){
diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh
b/targets/tinderbox/tinderbox-preclean-chroot.sh
index 240e2cb..5353f67 100755
--- a/targets/tinderbox/tinderbox-preclean-chroot.sh
+++ b/targets/tinderbox/tinderbox-preclean-chroot.sh
@@ -2,12 +2,4 @@
source /tmp/chroot-functions.sh
-if [ -n "${clst_DISTCC}" ]
-then
- cleanup_distcc
-fi
-
-if [ -n "${clst_ICECREAM}" ]
-then
- cleanup_icecream
-fi
+cleanup_stages
[gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
commit: fc30e2ab67dd74c6f52a042587a32d528fa576cf
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jun 15 16:31:33 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Sep 3 15:09:02 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=fc30e2ab
catalyst/base/stagebase.py: Fix "Creating stage tarball..." print()
catalyst/base/stagebase.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index aba330e..7231303 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1307,7 +1307,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
target_filename =
".".join([self.settings["target_path"],
self.compressor.extension(pack_info['mode'])])
- print "Creating stage tarball..."
+ print("Creating stage tarball... mode:",
+ self.settings["compression_mode"])
if self.compressor.compress(pack_info):
self.gen_contents_file(target_filename)
[gentoo-commits] proj/catalyst:pending commit in: /
commit: b97e75598be0ab265fa206d57e4ea918d78cbd38
Author: Brian Dolbec gentoo org>
AuthorDate: Sun May 24 16:07:36 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Sep 3 15:01:46 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b97e7559
testpath: Add pyDeComp path
testpath | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/testpath b/testpath
index 6fd9ba9..f4721a4 100644
--- a/testpath
+++ b/testpath
@@ -15,4 +15,4 @@
# catalyst -c catalyst.conf -p -f stage1.spec
export PATH="$(dirname ${BASH_SOURCE[0]})/bin:${PATH}"
-export PYTHONPATH="$(dirname ${BASH_SOURCE[0]})${PYTHONPATH:+:}${PYTHONPATH}"
+export PYTHONPATH="$(dirname $0)/../pyDeComp/:$(dirname
${BASH_SOURCE[0]})${PYTHONPATH:+:}${PYTHONPATH}"
[gentoo-commits] proj/catalyst:pending commit in: targets/support/, targets/stage4/
commit: e8ee4a518a2dc48d845e2f6bd09e0ce2cc62996e
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Thu Sep 3 01:46:06 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Sep 3 01:46:06 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e8ee4a51
use the cleanup_stage function instead of manual cleanup for stage4, do not
wipe log directories for tinderbox
targets/stage4/stage4-preclean-chroot.sh | 10 +-
targets/support/chroot-functions.sh | 2 +-
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/targets/stage4/stage4-preclean-chroot.sh
b/targets/stage4/stage4-preclean-chroot.sh
index 8f2e894..a22b6c1 100755
--- a/targets/stage4/stage4-preclean-chroot.sh
+++ b/targets/stage4/stage4-preclean-chroot.sh
@@ -7,12 +7,4 @@ source /tmp/chroot-functions.sh
update_env_settings
show_debug
-if [ -n "${clst_DISTCC}" ]
-then
- cleanup_distcc
-fi
-
-if [ -n "${clst_ICECREAM}" ]
-then
- cleanup_icecream
-fi
+cleanup_stages
diff --git a/targets/support/chroot-functions.sh
b/targets/support/chroot-functions.sh
index b8ab8d2..2986ae7 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -234,7 +234,7 @@ cleanup_stages() {
# Remove bindist from use
sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
- rm -f /var/log/emerge.log /var/log/portage/elog/*
+ [ "${clst_target}" != "tinderbox" ] && rm -f /var/log/emerge.log
/var/log/portage/elog/*
}
update_env_settings(){
[gentoo-commits] proj/catalyst:pending commit in: catalyst/targets/, catalyst/base/
commit: 07d13a24c6b28369c63c9cfcc955df6547300243
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jun 15 23:10:50 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Sep 3 15:12:39 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=07d13a24
Fix a couple print() uses back to print statements for consistency
catalyst/base/stagebase.py | 4 ++--
catalyst/targets/snapshot.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index e0e9023..f774ce8 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1308,8 +1308,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
target_filename =
".".join([self.settings["target_path"],
self.compressor.extension(pack_info['mode'])])
- print("Creating stage tarball... mode:",
- self.settings["compression_mode"])
+ print "Creating stage tarball... mode:", \
+ self.settings["compression_mode"]
if self.compressor.compress(pack_info):
self.gen_contents_file(target_filename)
diff --git a/catalyst/targets/snapshot.py b/catalyst/targets/snapshot.py
index ad96d37..1edcd02 100644
--- a/catalyst/targets/snapshot.py
+++ b/catalyst/targets/snapshot.py
@@ -72,11 +72,11 @@ class snapshot(TargetBase, GenBase):
auto_extension=True
)
if not compressor.compress(infodict):
- print("Snapshot compression failure")
+ print "Snapshot compression failure"
else:
filename = '.'.join([self.settings["snapshot_path"],
compressor.extension(self.settings["compression_mode"])])
- print("COMPRESSOR success filename", filename)
+ print "COMPRESSOR success filename", filename
self.gen_contents_file(filename)
self.gen_digest_file(filename)
[gentoo-commits] proj/catalyst:pending commit in: catalyst/, catalyst/targets/, catalyst/base/
commit: 171e7e154c2629d85cd9979bd31f03d639fe8182 Author: Brian Dolbec gentoo org> AuthorDate: Mon Jun 15 16:33:29 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Sep 3 15:12:38 2015 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=171e7e15 DeComp bug fixes catalyst/base/genbase.py | 2 +- catalyst/base/stagebase.py | 14 +- catalyst/main.py | 5 +++-- catalyst/targets/snapshot.py | 34 +- 4 files changed, 38 insertions(+), 17 deletions(-) diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py index e818781..c05b36d 100644 --- a/catalyst/base/genbase.py +++ b/catalyst/base/genbase.py @@ -24,7 +24,7 @@ class GenBase(object): array=keys.keys() array.sort() for j in array: - contents = contents_map.generate_contents(file, j, + contents = contents_map.contents(file, j, verbose="VERBOSE" in self.settings) if contents: myf.write(contents) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 7231303..e0e9023 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -10,7 +10,7 @@ from stat import ST_UID, ST_GID, ST_MODE # for convienience pjoin = os.path.join -from decomp.compress import CompressMap +from DeComp.compress import CompressMap from catalyst.defaults import (SOURCE_MOUNT_DEFAULTS, TARGET_MOUNT_DEFAULTS, PORT_LOGDIR_CLEAN) @@ -38,10 +38,11 @@ class StageBase(TargetBase, ClearBase, GenBase): self.required_values.extend(["version_stamp","target","subarch",\ "rel_type","profile","snapshot","source_subpath"]) - self.valid_values.extend(["version_stamp","target","subarch",\ - "rel_type","profile","snapshot","source_subpath","portage_confdir",\ - "cflags","cxxflags","fcflags","fflags","ldflags","cbuild","hostuse","portage_overlay",\ - "distcc_hosts","makeopts","pkgcache_path","kerncache_path"]) + self.valid_values.extend(["version_stamp","target","subarch", + "rel_type","profile","snapshot","source_subpath","portage_confdir", + "cflags","cxxflags","fcflags","fflags","ldflags","cbuild","hostuse","portage_overlay", + "distcc_hosts","makeopts","pkgcache_path","kerncache_path", + "compression_mode", "decompression_mode"]) self.set_valid_build_kernel_vars(addlargs) TargetBase.__init__(self, myspec, addlargs) @@ -1371,6 +1372,9 @@ class StageBase(TargetBase, ClearBase, GenBase): # lists in arch/amd64.py and friends. If we wanted self.settigs[var] # of any depth, we should make this function recursive. elif type(self.settings[x]) == types.DictType: + if x in ["compress_definitions", + "decompress_definitions"]: + continue self.env[varname] = string.join(self.settings[x].keys()) for y in self.settings[x].keys(): varname2 = "clst_"+string.replace(y,"/","_") diff --git a/catalyst/main.py b/catalyst/main.py index 7e3b55e..dc9342b 100644 --- a/catalyst/main.py +++ b/catalyst/main.py @@ -13,11 +13,12 @@ import os.path __selfpath__ = os.path.abspath(os.path.dirname(__file__)) -from decomp.compress import COMPRESS_DEFINITIONS, DECOMPRESS_DEFINITIONS +from DeComp.definitions import (COMPRESS_DEFINITIONS, DECOMPRESS_DEFINITIONS, + CONTENTS_DEFINITIONS) +from DeComp.contents import ContentsMap import catalyst.config import catalyst.util -from catalyst.contents import ContentsMap, CONTENTS_DEFINITIONS from catalyst.defaults import confdefaults, option_messages from catalyst.hash_utils import HashMap, HASH_DEFINITIONS from catalyst.lock import LockInUse diff --git a/catalyst/targets/snapshot.py b/catalyst/targets/snapshot.py index 1887110..ad96d37 100644 --- a/catalyst/targets/snapshot.py +++ b/catalyst/targets/snapshot.py @@ -6,18 +6,21 @@ import os import shutil from stat import ST_UID, ST_GID, ST_MODE +from DeComp.compress import CompressMap from catalyst.support import normpath, cmd from catalyst.base.targetbase import TargetBase from catalyst.base.genbase import GenBase from catalyst.fileops import ensure_dirs + + class snapshot(TargetBase, GenBase): """ Builder class for snapshots. """ def __init__(self,myspec,addlar
[gentoo-commits] proj/catalyst:pending commit in: targets/stage1/
commit: 306d797509244bf3508def0aa6c1bbcdfb6e1257
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Thu Sep 3 01:50:33 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Sep 3 01:50:33 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=306d7975
remove stray bindist use flag setting from stage1 chroot, this is handled by
setup_pkgmgr early enough
targets/stage1/stage1-chroot.sh | 2 --
1 file changed, 2 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 028089e..91ab1fa 100755
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -7,8 +7,6 @@ export clst_buildpkgs="$(/tmp/build.py)"
# Setup our environment
BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
-[ -n "${clst_BINDIST}" ] && BINDIST="bindist"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} ${BINDIST}"
FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
[gentoo-commits] proj/catalyst:pending commit in: targets/support/, catalyst/base/
commit: da114f314109977bca344179ed7c3aa648837afd
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Wed Sep 2 21:22:01 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Wed Sep 2 21:22:01 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=da114f31
fix minor typo
catalyst/base/stagebase.py | 2 +-
targets/support/chroot-functions.sh | 9 +++--
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index c0bafc2..23491aa 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1097,7 +1097,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
myusevars.extend(self.settings["use"])
if myusevars:
- myf.write("# These are the USE and USE_EXPAND
flags that were used for\n# buidling in addition to what is provided by the
profile.\n")
+ myf.write("# These are the USE and USE_EXPAND
flags that were used for\n# building in addition to what is provided by the
profile.\n")
myusevars = sorted(set(myusevars))
myf.write('USE="'+string.join(myusevars)+'"\n')
if '-*' in myusevars:
diff --git a/targets/support/chroot-functions.sh
b/targets/support/chroot-functions.sh
index 5e046cb..5dd542e 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -166,6 +166,9 @@ setup_gcc(){
}
setup_pkgmgr(){
+ # Set bindist USE flag if clst_BINDIST is set
+ [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
+
# We need to merge our package manager with USE="build" set in case it
is
# portage to avoid frying our /etc/portage/make.conf file. Otherwise,
we could
# just let emerge @system could merge it.
@@ -268,9 +271,6 @@ run_merge() {
export EPAUSE_IGNORE=0
export CONFIG_PROTECT="-*"
- # Set bindist USE flag if clst_BINDIST is set
- [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
-
if [ -n "${clst_VERBOSE}" ]
then
echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt $@" || exit 1
@@ -287,9 +287,6 @@ run_merge() {
echo "emerge ${clst_myemergeopts} $@" || exit 1
emerge ${clst_myemergeopts} $@ || exit 1
-
- # Clean-up USE again
- sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
}
show_debug() {
[gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
commit: 75cdef7e4593d3de0c407610ae2f3a55b1859336
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Wed Sep 2 21:23:10 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Wed Sep 2 21:23:10 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=75cdef7e
fix minor typo
catalyst/base/stagebase.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index c0bafc2..23491aa 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1097,7 +1097,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
myusevars.extend(self.settings["use"])
if myusevars:
- myf.write("# These are the USE and USE_EXPAND
flags that were used for\n# buidling in addition to what is provided by the
profile.\n")
+ myf.write("# These are the USE and USE_EXPAND
flags that were used for\n# building in addition to what is provided by the
profile.\n")
myusevars = sorted(set(myusevars))
myf.write('USE="'+string.join(myusevars)+'"\n')
if '-*' in myusevars:
[gentoo-commits] proj/catalyst:pending commit in: targets/support/, catalyst/base/
commit: cec4889344a5c5de7fa02ade0253808dc73f3008
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Wed Sep 2 21:22:38 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Wed Sep 2 21:22:38 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=cec48893
Revert "fix minor typo"
This reverts commit da114f314109977bca344179ed7c3aa648837afd.
bad commit
catalyst/base/stagebase.py | 2 +-
targets/support/chroot-functions.sh | 9 ++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 23491aa..c0bafc2 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1097,7 +1097,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
myusevars.extend(self.settings["use"])
if myusevars:
- myf.write("# These are the USE and USE_EXPAND
flags that were used for\n# building in addition to what is provided by the
profile.\n")
+ myf.write("# These are the USE and USE_EXPAND
flags that were used for\n# buidling in addition to what is provided by the
profile.\n")
myusevars = sorted(set(myusevars))
myf.write('USE="'+string.join(myusevars)+'"\n')
if '-*' in myusevars:
diff --git a/targets/support/chroot-functions.sh
b/targets/support/chroot-functions.sh
index 5dd542e..5e046cb 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -166,9 +166,6 @@ setup_gcc(){
}
setup_pkgmgr(){
- # Set bindist USE flag if clst_BINDIST is set
- [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
-
# We need to merge our package manager with USE="build" set in case it
is
# portage to avoid frying our /etc/portage/make.conf file. Otherwise,
we could
# just let emerge @system could merge it.
@@ -271,6 +268,9 @@ run_merge() {
export EPAUSE_IGNORE=0
export CONFIG_PROTECT="-*"
+ # Set bindist USE flag if clst_BINDIST is set
+ [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
+
if [ -n "${clst_VERBOSE}" ]
then
echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt $@" || exit 1
@@ -287,6 +287,9 @@ run_merge() {
echo "emerge ${clst_myemergeopts} $@" || exit 1
emerge ${clst_myemergeopts} $@ || exit 1
+
+ # Clean-up USE again
+ sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
}
show_debug() {
[gentoo-commits] proj/catalyst:pending commit in: targets/support/
commit: 9bdb0512140496d53f97f7ef4592921306056d6b
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Wed Sep 2 21:25:24 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Wed Sep 2 21:25:24 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9bdb0512
shuffle where bindist is being set
set USE=bindist in setup_pkgmgr and remove it in cleanup_stage
targets/support/chroot-functions.sh | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/targets/support/chroot-functions.sh
b/targets/support/chroot-functions.sh
index 5e046cb..b8ab8d2 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -166,6 +166,9 @@ setup_gcc(){
}
setup_pkgmgr(){
+ # Set bindist USE flag if clst_BINDIST is set
+ [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
+
# We need to merge our package manager with USE="build" set in case it
is
# portage to avoid frying our /etc/portage/make.conf file. Otherwise,
we could
# just let emerge @system could merge it.
@@ -228,6 +231,9 @@ cleanup_stages() {
;;
esac
+ # Remove bindist from use
+ sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
+
rm -f /var/log/emerge.log /var/log/portage/elog/*
}
@@ -268,9 +274,6 @@ run_merge() {
export EPAUSE_IGNORE=0
export CONFIG_PROTECT="-*"
- # Set bindist USE flag if clst_BINDIST is set
- [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
-
if [ -n "${clst_VERBOSE}" ]
then
echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt $@" || exit 1
@@ -287,9 +290,6 @@ run_merge() {
echo "emerge ${clst_myemergeopts} $@" || exit 1
emerge ${clst_myemergeopts} $@ || exit 1
-
- # Clean-up USE again
- sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
}
show_debug() {
[gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/, x11-base/xorg-server/files/
commit: 9695eae2fcfd4e20f418a488729639dce3556376
Author: Chí-Thanh Christopher Nguyễn gentoo org>
AuthorDate: Thu Sep 3 15:56:58 2015 +
Commit: Chí-Thanh Christopher Nguyễn gentoo org>
CommitDate: Thu Sep 3 15:56:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9695eae2
x11-base/xorg-server: add patches for CVE-2015-3164
Bug: https://bugs.gentoo.org/show_bug.cgi?id=551680
Package-Manager: portage-2.2.20.1
.../files/xorg-server-1.17-cve-2015-3164-1.patch | 33 +++
.../files/xorg-server-1.17-cve-2015-3164-2.patch | 246 +++
.../files/xorg-server-1.17-cve-2015-3164-3.patch | 34 +++
x11-base/xorg-server/xorg-server-1.16.4-r3.ebuild | 261 +
x11-base/xorg-server/xorg-server-1.16.4-r4.ebuild | 236 +++
5 files changed, 810 insertions(+)
diff --git a/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-3164-1.patch
b/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-3164-1.patch
new file mode 100644
index 000..a9f8030
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-3164-1.patch
@@ -0,0 +1,33 @@
+From c4534a38b68aa07fb82318040dc8154fb48a9588 Mon Sep 17 00:00:00 2001
+From: Ray Strode
+Date: Tue, 5 May 2015 16:43:42 -0400
+Subject: xwayland: Enable access control on open sockets [CVE-2015-3164 1/3]
+
+Xwayland currently allows wide-open access to the X sockets
+it listens on, ignoring Xauth access control.
+
+This commit makes sure to enable access control on the sockets,
+so one user can't snoop on another user's X-over-wayland
+applications.
+
+Signed-off-by: Ray Strode
+Reviewed-by: Daniel Stone
+Reviewed-by: Alan Coopersmith
+Signed-off-by: Keith Packard
+
+diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
+index 7e8d667..c5bee77 100644
+--- a/hw/xwayland/xwayland.c
b/hw/xwayland/xwayland.c
+@@ -483,7 +483,7 @@ listen_on_fds(struct xwl_screen *xwl_screen)
+ int i;
+
+ for (i = 0; i < xwl_screen->listen_fd_count; i++)
+-ListenOnOpenFD(xwl_screen->listen_fds[i], TRUE);
++ListenOnOpenFD(xwl_screen->listen_fds[i], FALSE);
+ }
+
+ static void
+--
+cgit v0.10.2
+
diff --git a/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-3164-2.patch
b/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-3164-2.patch
new file mode 100644
index 000..47b323f
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-3164-2.patch
@@ -0,0 +1,246 @@
+From 4b4b9086d02b80549981d205fb1f495edc373538 Mon Sep 17 00:00:00 2001
+From: Ray Strode
+Date: Tue, 5 May 2015 16:43:43 -0400
+Subject: os: support new implicit local user access mode [CVE-2015-3164 2/3]
+
+If the X server is started without a '-auth' argument, then
+it gets started wide open to all local users on the system.
+
+This isn't a great default access model, but changing it in
+Xorg at this point would break backward compatibility.
+
+Xwayland, on the other hand is new, and much more targeted
+in scope. It could, in theory, be changed to allow the much
+more secure default of a "user who started X server can connect
+clients to that server."
+
+This commit paves the way for that change, by adding a mechanism
+for DDXs to opt-in to that behavior. They merely need to call
+
+LocalAccessScopeUser()
+
+in their init functions.
+
+A subsequent commit will add that call for Xwayland.
+
+Signed-off-by: Ray Strode
+Reviewed-by: Daniel Stone
+Reviewed-by: Alan Coopersmith
+Signed-off-by: Keith Packard
+
+diff --git a/include/os.h b/include/os.h
+index 6638c84..b2b96c8 100644
+--- a/include/os.h
b/include/os.h
+@@ -431,11 +431,28 @@ extern _X_EXPORT void
+ ResetHosts(const char *display);
+
+ extern _X_EXPORT void
++EnableLocalAccess(void);
++
++extern _X_EXPORT void
++DisableLocalAccess(void);
++
++extern _X_EXPORT void
+ EnableLocalHost(void);
+
+ extern _X_EXPORT void
+ DisableLocalHost(void);
+
++#ifndef NO_LOCAL_CLIENT_CRED
++extern _X_EXPORT void
++EnableLocalUser(void);
++
++extern _X_EXPORT void
++DisableLocalUser(void);
++
++extern _X_EXPORT void
++LocalAccessScopeUser(void);
++#endif
++
+ extern _X_EXPORT void
+ AccessUsingXdmcp(void);
+
+diff --git a/os/access.c b/os/access.c
+index 8fa028e..75e7a69 100644
+--- a/os/access.c
b/os/access.c
+@@ -102,6 +102,10 @@ SOFTWARE.
+ #include
+ #include
+
++#ifndef NO_LOCAL_CLIENT_CRED
++#include
++#endif
++
+ #if defined(TCPCONN) || defined(STREAMSCONN)
+ #include
+ #endif /* TCPCONN || STREAMSCONN */
+@@ -225,6 +229,13 @@ static int LocalHostEnabled = FALSE;
+ static int LocalHostRequested = FALSE;
+ static int UsingXdmcp = FALSE;
+
++static enum {
++LOCAL_ACCESS_SCOPE_HOST = 0,
++#ifndef NO_LOCAL_CLIENT_CRED
++LOCAL_ACCESS_SCOPE_USER,
++#endif
++} LocalAccessScope;
++
+ /* FamilyServerInterpreted implementation */
+ static Bool siAddrMatch(int family, void *addr, int len, HOST * host,
+ ClientPtr client);
+@@ -237,6 +248,21 @@ stat
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/
commit: 071ff6141aa2a1fda4153eada61a179706c733dc
Author: Patrice Clement gentoo org>
AuthorDate: Thu Sep 3 15:11:23 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Sep 3 16:00:47 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=071ff614
www-servers/resin: Bump dev-java/mojarra SLOT to 2.2. Fixes security bug 501280.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement gentoo.org>
www-servers/resin/resin-4.0.44-r2.ebuild | 199 +++
1 file changed, 199 insertions(+)
diff --git a/www-servers/resin/resin-4.0.44-r2.ebuild
b/www-servers/resin/resin-4.0.44-r2.ebuild
new file mode 100644
index 000..a02ac24
--- /dev/null
+++ b/www-servers/resin/resin-4.0.44-r2.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib user
+
+DESCRIPTION="A fast Servlet and JSP engine"
+HOMEPAGE="http://www.caucho.com";
+SRC_URI="http://www.caucho.com/download/${P}-src.zip";
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="admin doc"
+
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/resin-servlet-api:3.0
+ dev-java/jsr101:0
+ dev-java/mojarra:2.2
+ dev-java/oracle-javamail:0
+ dev-java/validation-api:1.0
+ dev-java/glassfish-xmlrpc-api:0
+ dev-java/glassfish-deployment-api:1.2"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip
+ dev-libs/openssl
+ dev-java/ant-core:0
+ ${CDEPEND}"
+
+RESIN_HOME="/usr/$(get_libdir)/resin"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="
+jsr101
+mojarra-2.2
+oracle-javamail
+validation-api-1.0
+glassfish-xmlrpc-api
+resin-servlet-api-3.0
+glassfish-deployment-api-1.2"
+
+PATCHES=(
+ "${FILESDIR}"/"${PV}"/resin-compile.patch
+ "${FILESDIR}"/"${PV}"/build.xml.patch
+)
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup resin
+ enewuser resin -1 /bin/bash ${RESIN_HOME} resin
+}
+
+src_prepare() {
+ local vm_version=$(java-pkg_get-vm-version)
+
+ # #558442.
+ if [[ "${vm_version}" == "1.8" ]]; then
+ PATCHES+=("${FILESDIR}"/"${PV}"/VarType.java.patch)
+ fi
+
+ epatch "${PATCHES[@]}"
+
+ # No bundled JARs!
+ rm -f "${S}/modules/ext/"*.jar || die
+ rm -rf "${S}/project-jars" || die
+
+ java-ant_bsfix_one "${S}/build.xml"
+ java-ant_bsfix_one "${S}/build-common.xml"
+
+ rm -rf lib/* || die
+
+ java-pkg_jar-from --into lib jsr101
+ java-pkg_jar-from --into lib mojarra-1.2
+ java-pkg_jar-from --into lib oracle-javamail
+ java-pkg_jar-from --into lib validation-api-1.0
+ java-pkg_jar-from --into lib glassfish-xmlrpc-api
+ java-pkg_jar-from --into lib glassfish-deployment-api-1.2
+ java-pkg_jar-from --into lib resin-servlet-api-3.0 resin-servlet-api.jar
+
+ ln -s $(java-config --jdk-home)/lib/tools.jar || die
+}
+
+src_configure() {
+ append-flags -fPIC -DPIC
+
+ chmod 755 "${S}/configure" || die
+ econf --prefix=${RESIN_HOME} || die "econf failed"
+}
+
+src_compile() {
+ einfo "Building libraries..."
+ emake || die "make failed"
+
+ einfo "Building jars..."
+ eant || die "ant failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "Install failed"
+
+ einfo "Moving configuration to /etc ..."
+ dodir /etc/
+ mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die "mv of conf failed"
+ dosym /etc/resin ${RESIN_HOME}/conf
+
+ einfo "Rewriting resin.xml ..."
+ sed -i \
+ -e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \
+ -e 's,${resin.root}/doc/admin,webapps/admin,' \
+ "${D}/etc/resin/resin.xml" || die
+
+ einfo "Fixing log directory ..."
+ rm -rf "${D}/${RESIN_HOME}/log" || die
+ keepdir /var/log/resin
+ dosym /var/log/resin ${RESIN_HOME}/log
+
+ einfo "Installing basic documentation ..."
+ dodoc README "${S}"/conf/*.xml
+
+ einfo "Installing init.d script ..."
+ newinitd "${FILESDIR}/${PV}/resin.init" resin
+ newconfd "${FILESDIR}/${PV}/resin.conf" resin
+
+ sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" ||
die
+
+ einfo "Fixing location of jars ..."
+ rm -f "${S}/lib/tools.jar" || die
+ java-pkg_dojar "${S}"/lib/*.jar
+ rm -fr "${D}/${RESIN_HOME}/lib" || die
+ dosym /usr/share/resin/lib ${RESIN_HOME}/lib
+
+ einfo "Symlinking directories from /var/lib/resin ..."
+ rm -rf "${D}/${RESIN_HOME}/resin-data" || die
+ rm -rf "${D}/${RESIN_HOME}/watchdog-data" || die
+ dodir /var/lib/resin/webapps
+ keepdir /var/lib/resin/hosts
+ keepdir /var/lib/resin/resin-data
+ keepdir /var/lib/re
[gentoo-commits] repo/gentoo:master commit in: www-servers/resin/
commit: 7d20c1e914f31c905f1abea76c7caf4d04591c55
Author: Patrice Clement gentoo org>
AuthorDate: Thu Sep 3 15:23:03 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Sep 3 16:00:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d20c1e9
www-servers/resin: Drop old.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement gentoo.org>
www-servers/resin/resin-4.0.44-r1.ebuild | 199 ---
1 file changed, 199 deletions(-)
diff --git a/www-servers/resin/resin-4.0.44-r1.ebuild
b/www-servers/resin/resin-4.0.44-r1.ebuild
deleted file mode 100644
index 5518667..000
--- a/www-servers/resin/resin-4.0.44-r1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib user
-
-DESCRIPTION="A fast Servlet and JSP engine"
-HOMEPAGE="http://www.caucho.com";
-SRC_URI="http://www.caucho.com/download/${P}-src.zip";
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="admin doc"
-
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/resin-servlet-api:3.0
- dev-java/jsr101:0
- dev-java/mojarra:1.2
- dev-java/oracle-javamail:0
- dev-java/validation-api:1.0
- dev-java/glassfish-xmlrpc-api:0
- dev-java/glassfish-deployment-api:1.2"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- dev-libs/openssl
- dev-java/ant-core:0
- ${CDEPEND}"
-
-RESIN_HOME="/usr/$(get_libdir)/resin"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="
-jsr101
-mojarra-1.2
-oracle-javamail
-validation-api-1.0
-glassfish-xmlrpc-api
-resin-servlet-api-3.0
-glassfish-deployment-api-1.2"
-
-PATCHES=(
- "${FILESDIR}"/"${PV}"/resin-compile.patch
- "${FILESDIR}"/"${PV}"/build.xml.patch
-)
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup resin
- enewuser resin -1 /bin/bash ${RESIN_HOME} resin
-}
-
-src_prepare() {
- local vm_version=$(java-pkg_get-vm-version)
-
- # #558442.
- if [[ "${vm_version}" == "1.8" ]]; then
- PATCHES+=("${FILESDIR}"/"${PV}"/VarType.java.patch)
- fi
-
- epatch "${PATCHES[@]}"
-
- # No bundled JARs!
- rm -f "${S}/modules/ext/"*.jar || die
- rm -rf "${S}/project-jars" || die
-
- java-ant_bsfix_one "${S}/build.xml"
- java-ant_bsfix_one "${S}/build-common.xml"
-
- rm -rf lib/* || die
-
- java-pkg_jar-from --into lib jsr101
- java-pkg_jar-from --into lib mojarra-1.2
- java-pkg_jar-from --into lib oracle-javamail
- java-pkg_jar-from --into lib validation-api-1.0
- java-pkg_jar-from --into lib glassfish-xmlrpc-api
- java-pkg_jar-from --into lib glassfish-deployment-api-1.2
- java-pkg_jar-from --into lib resin-servlet-api-3.0 resin-servlet-api.jar
-
- ln -s $(java-config --jdk-home)/lib/tools.jar || die
-}
-
-src_configure() {
- append-flags -fPIC -DPIC
-
- chmod 755 "${S}/configure" || die
- econf --prefix=${RESIN_HOME} || die "econf failed"
-}
-
-src_compile() {
- einfo "Building libraries..."
- emake || die "make failed"
-
- einfo "Building jars..."
- eant || die "ant failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "Install failed"
-
- einfo "Moving configuration to /etc ..."
- dodir /etc/
- mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die "mv of conf failed"
- dosym /etc/resin ${RESIN_HOME}/conf
-
- einfo "Rewriting resin.xml ..."
- sed -i \
- -e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \
- -e 's,${resin.root}/doc/admin,webapps/admin,' \
- "${D}/etc/resin/resin.xml" || die
-
- einfo "Fixing log directory ..."
- rm -rf "${D}/${RESIN_HOME}/log" || die
- keepdir /var/log/resin
- dosym /var/log/resin ${RESIN_HOME}/log
-
- einfo "Installing basic documentation ..."
- dodoc README "${S}"/conf/*.xml
-
- einfo "Installing init.d script ..."
- newinitd "${FILESDIR}/${PV}/resin.init" resin
- newconfd "${FILESDIR}/${PV}/resin.conf" resin
-
- sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" ||
die
-
- einfo "Fixing location of jars ..."
- rm -f "${S}/lib/tools.jar" || die
- java-pkg_dojar "${S}"/lib/*.jar
- rm -fr "${D}/${RESIN_HOME}/lib" || die
- dosym /usr/share/resin/lib ${RESIN_HOME}/lib
-
- einfo "Symlinking directories from /var/lib/resin ..."
- rm -rf "${D}/${RESIN_HOME}/resin-data" || die
- rm -rf "${D}/${RESIN_HOME}/watchdog-data" || die
- dodir /var/lib/resin/webapps
- keepdir /var/lib/resin/hosts
- keepdir /var/lib/resin/resin-data
- keepdir /var/lib/resin/watchdog-data
- mv "${D}"/${RESIN_HOME}
[gentoo-commits] repo/gentoo:master commit in: dev-java/mojarra/files/, dev-java/mojarra/
commit: da8f2314bd0b6df70a4016918e4450d632c24aff
Author: Patrice Clement gentoo org>
AuthorDate: Thu Sep 3 15:52:55 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Sep 3 16:00:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da8f2314
dev-java/mojarra: Version bump. Fixes security bug 501280.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement gentoo.org>
dev-java/mojarra/Manifest | 1 +
.../mojarra/files/mojarra-2.2.12-Util.java.patch | 25
dev-java/mojarra/mojarra-2.2.12.ebuild | 46 ++
3 files changed, 72 insertions(+)
diff --git a/dev-java/mojarra/Manifest b/dev-java/mojarra/Manifest
index 9332e5a..21cd8dd 100644
--- a/dev-java/mojarra/Manifest
+++ b/dev-java/mojarra/Manifest
@@ -1,3 +1,4 @@
+DIST javax.faces-2.2.12-sources.jar 3105808 SHA256
503c0a1c6a270429798a6507d477ee2114f0de5204c64d5660a11796c498ab61 SHA512
b2bc2ce38d72af38a4b2fdb5aec790600ca41a5d7f6340bf6be671a901c9fe664d50d9d13f021694e85e0e145a2031e2d8b61dd6d6ccebb544f2512a91ff670a
WHIRLPOOL
98a5473c8c7841cf5baae4b879d2b0a9e1b64d3666b820aa7c1aeece43d3689fc8b93766c280906f19dd23d3e13436c6514b533a3d810bdb96e88d4d78666a87
DIST javax.faces-2.2.9-sources.jar 3098257 SHA256
f3ba4bcafcdac5e92bd784574e3f0b35ff4b7c56d07dda628a8e0246d1a40b27 SHA512
a398c7edd483af59e59c52896dfd6fbf67948cb9778940bb5045c6c4ee2e0549e24ee321dcf7a8bdadbbec82c7e533840bc42669e79664fa864627744b6cc0e3
WHIRLPOOL
040768e9aba1575137e4a1ef7bbf587fea71ff46119066a0fe5b72a9c0a1da647fbef1a712952efa0d59d51ca346366eefc0f79b7912cc7d071d695a39edf48c
DIST mojarra-1.2_15-b01-FCS-patch.bz2 4369 SHA256
c8495b51225201bf23033a01bb853abf1cc0a40214aa6a68c7dd1c30812e6cd1 SHA512
125e511b052d4c70314a069c47ce72b51e4dd9d1c6826def6c1a8c0bf72f6c711a9fb9f05065a5f1f46dce8462b701198f67d257b1f0aa683b494b31d90205ac
WHIRLPOOL
62efb9f165d40be7ba94be04046867b342d2ba39f340443bceb3f8b421c9be2c8c312ea9e04d7c743e6440fe124bd8566fa383013a9654b7758f180f659234c4
DIST mojarra-1.2_15-b01-FCS-source.zip 5091287 SHA256
8678db1e93a2f605b696ae3a04e145bc14dd46409301ae230dc6ee4477ccb343 SHA512
6e8d8278aac36d3971bef523f8ec90a4959c0d6ec69642d5edd10379c2cdbe13242ad197475abda887b886f166b8c7ea762be5560a746f2426cec9c6a25c0144
WHIRLPOOL
c5b2ab6a568468c2570d61d5cf8bc5f7147b403c9f7718c2ea32eda783605f48aa41c9f8a96cf48e13c10e5859061a527f40c003d7ff48a66571be6a69472559
diff --git a/dev-java/mojarra/files/mojarra-2.2.12-Util.java.patch
b/dev-java/mojarra/files/mojarra-2.2.12-Util.java.patch
new file mode 100644
index 000..23033f6
--- /dev/null
+++ b/dev-java/mojarra/files/mojarra-2.2.12-Util.java.patch
@@ -0,0 +1,25 @@
+--- src/com/sun/faces/util/Util.java.orig 2015-09-03 14:43:30.953486000
+
src/com/sun/faces/util/Util.java 2015-09-03 14:43:57.692486000 +
+@@ -354,13 +354,15 @@
+ // as the same adapter in a standalone program works as one might
expect.
+ // So, for now, if the classname starts with '[', then use
Class.forName()
+ // to avoid CR 643419 and for all other cases, use
ClassLoader.loadClass().
+-if (loader.getClass() ==
com.sun.faces.scripting.groovy.GroovyHelperImpl.MojarraGroovyClassLoader.class)
{
+-if (name.charAt(0) == '[') {
+-return Class.forName(name, true, loader);
+-} else {
+-return loader.loadClass(name);
+-}
+-}
++//
++// Disable Groovy support.
++// if (loader.getClass() ==
com.sun.faces.scripting.groovy.GroovyHelperImpl.MojarraGroovyClassLoader.class)
{
++// if (name.charAt(0) == '[') {
++// return Class.forName(name, true, loader);
++// } else {
++// return loader.loadClass(name);
++// }
++// }
+ return Class.forName(name, true, loader);
+ }
+
diff --git a/dev-java/mojarra/mojarra-2.2.12.ebuild
b/dev-java/mojarra/mojarra-2.2.12.ebuild
new file mode 100644
index 000..8a94ed4
--- /dev/null
+++ b/dev-java/mojarra/mojarra-2.2.12.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Project Mojarra - GlassFish's Implementation for JavaServer Faces
API"
+HOMEPAGE="https://javaserverfaces.dev.java.net/";
+SRC_URI="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/${PV}/javax.faces-${PV}-sources.jar";
+
+LICENSE="CDDL"
+SLOT="2.2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+CDEPEND="dev-java/glassfish-persistence:0
+ dev-java/glassfish-ejb-api:0
+ java-virtuals/servlet-api:3.0
+ dev-java/tomcat-jstl-spec:1.2.5
+ dev-java/tomcat-jstl-impl:1.2.5
+ dev-java/validation-api:1.0
+ dev-java/javax-inject:0
+ dev-java/cdi-api:1.2"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPE
[gentoo-commits] repo/gentoo:master commit in: dev-java/mojarra/files/, dev-java/mojarra/
commit: c8d1617a77572f397ad51cc546a4a06639359614
Author: Patrice Clement gentoo org>
AuthorDate: Thu Sep 3 15:57:56 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Sep 3 16:00:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8d1617a
dev-java/mojarra: Remove vulnerable versions. Fixes bug 501280.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement gentoo.org>
dev-java/mojarra/Manifest | 3 -
.../mojarra/files/mojarra-2.2.9-Util.java.patch| 26 ---
dev-java/mojarra/mojarra-1.2.15-r2.ebuild | 85 --
dev-java/mojarra/mojarra-2.2.9.ebuild | 46
4 files changed, 160 deletions(-)
diff --git a/dev-java/mojarra/Manifest b/dev-java/mojarra/Manifest
index 21cd8dd..4e68f51 100644
--- a/dev-java/mojarra/Manifest
+++ b/dev-java/mojarra/Manifest
@@ -1,4 +1 @@
DIST javax.faces-2.2.12-sources.jar 3105808 SHA256
503c0a1c6a270429798a6507d477ee2114f0de5204c64d5660a11796c498ab61 SHA512
b2bc2ce38d72af38a4b2fdb5aec790600ca41a5d7f6340bf6be671a901c9fe664d50d9d13f021694e85e0e145a2031e2d8b61dd6d6ccebb544f2512a91ff670a
WHIRLPOOL
98a5473c8c7841cf5baae4b879d2b0a9e1b64d3666b820aa7c1aeece43d3689fc8b93766c280906f19dd23d3e13436c6514b533a3d810bdb96e88d4d78666a87
-DIST javax.faces-2.2.9-sources.jar 3098257 SHA256
f3ba4bcafcdac5e92bd784574e3f0b35ff4b7c56d07dda628a8e0246d1a40b27 SHA512
a398c7edd483af59e59c52896dfd6fbf67948cb9778940bb5045c6c4ee2e0549e24ee321dcf7a8bdadbbec82c7e533840bc42669e79664fa864627744b6cc0e3
WHIRLPOOL
040768e9aba1575137e4a1ef7bbf587fea71ff46119066a0fe5b72a9c0a1da647fbef1a712952efa0d59d51ca346366eefc0f79b7912cc7d071d695a39edf48c
-DIST mojarra-1.2_15-b01-FCS-patch.bz2 4369 SHA256
c8495b51225201bf23033a01bb853abf1cc0a40214aa6a68c7dd1c30812e6cd1 SHA512
125e511b052d4c70314a069c47ce72b51e4dd9d1c6826def6c1a8c0bf72f6c711a9fb9f05065a5f1f46dce8462b701198f67d257b1f0aa683b494b31d90205ac
WHIRLPOOL
62efb9f165d40be7ba94be04046867b342d2ba39f340443bceb3f8b421c9be2c8c312ea9e04d7c743e6440fe124bd8566fa383013a9654b7758f180f659234c4
-DIST mojarra-1.2_15-b01-FCS-source.zip 5091287 SHA256
8678db1e93a2f605b696ae3a04e145bc14dd46409301ae230dc6ee4477ccb343 SHA512
6e8d8278aac36d3971bef523f8ec90a4959c0d6ec69642d5edd10379c2cdbe13242ad197475abda887b886f166b8c7ea762be5560a746f2426cec9c6a25c0144
WHIRLPOOL
c5b2ab6a568468c2570d61d5cf8bc5f7147b403c9f7718c2ea32eda783605f48aa41c9f8a96cf48e13c10e5859061a527f40c003d7ff48a66571be6a69472559
diff --git a/dev-java/mojarra/files/mojarra-2.2.9-Util.java.patch
b/dev-java/mojarra/files/mojarra-2.2.9-Util.java.patch
deleted file mode 100644
index d73ee9c..000
--- a/dev-java/mojarra/files/mojarra-2.2.9-Util.java.patch
+++ /dev/null
@@ -1,26 +0,0 @@
src/com/sun/faces/util/Util.java.orig 2015-06-08 21:08:39.77000
+
-+++ src/com/sun/faces/util/Util.java 2015-06-08 21:10:12.71900 +
-@@ -315,13 +315,16 @@
- // as the same adapter in a standalone program works as one might
expect.
- // So, for now, if the classname starts with '[', then use
Class.forName()
- // to avoid CR 643419 and for all other cases, use
ClassLoader.loadClass().
--if (loader.getClass() ==
com.sun.faces.scripting.groovy.GroovyHelperImpl.MojarraGroovyClassLoader.class)
{
--if (name.charAt(0) == '[') {
--return Class.forName(name, true, loader);
--} else {
--return loader.loadClass(name);
--}
--}
-+//
-+// Disable Groovy stuff for the time being
-+// since groovy 2.4 hasn't hit the tree... yet.
-+// if (loader.getClass() ==
com.sun.faces.scripting.groovy.GroovyHelperImpl.MojarraGroovyClassLoader.class)
{
-+// if (name.charAt(0) == '[') {
-+// return Class.forName(name, true, loader);
-+// } else {
-+// return loader.loadClass(name);
-+// }
-+// }
- return Class.forName(name, true, loader);
- }
-
diff --git a/dev-java/mojarra/mojarra-1.2.15-r2.ebuild
b/dev-java/mojarra/mojarra-1.2.15-r2.ebuild
deleted file mode 100644
index 300ac12..000
--- a/dev-java/mojarra/mojarra-1.2.15-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-WANT_ANT_TASKS="ant-trax"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PV="$(get_version_component_range 1-2)_$(get_version_component_range
3)-b01-FCS"
-
-DESCRIPTION="Project Mojarra - GlassFish's Implementation for JavaServer Faces
API"
-HOMEPAGE="https://javaserverfaces.dev.java.net/";
-SRC_URI="https://javaserverfaces.dev.java.net/files/documents/1866/151669/${PN}-${MY_PV}-source.zip
- mirror://gentoo/${PN}-${MY_PV}-patch.bz2"
-
-LICENSE="CDDL"
-SLOT="1.2"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-COMMON_DEP="
- dev-
[gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-servlet-api/
commit: c985fa1bcd24e35b90d3d510c83efe43ec8c014b
Author: Miroslav Šulc gentoo org>
AuthorDate: Thu Sep 3 16:39:54 2015 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Thu Sep 3 16:39:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c985fa1b
dev-java/tomcat-servlet-api: version bump
Package-Manager: portage-2.2.20.1
dev-java/tomcat-servlet-api/Manifest | 1 +
.../tomcat-servlet-api-8.0.26.ebuild | 36 ++
2 files changed, 37 insertions(+)
diff --git a/dev-java/tomcat-servlet-api/Manifest
b/dev-java/tomcat-servlet-api/Manifest
index 51c5cf4..89f0146 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -6,4 +6,5 @@ DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256
3a1dedda4019db87464fca3aeb4e
DIST apache-tomcat-7.0.63-src.tar.gz 4577737 SHA256
443aa92f2668906fb24cc43ba952068240f445df637a6e5da8d4661527536657 SHA512
677b28aa0131d309aed83afc73a778c16fd27a187e971ea6929b9b6b65268caa2a67cc468b15565a7d5944a60e8528cc26c82437b476ebc41ff9556367349d8a
WHIRLPOOL
a208ac63ed6f7ce7ac23674d8bb20d523b3fb5d10dfb46d292004f9b296986c4cab690f0252ad53bb4c625c3f58e04b9ddcda5a580fdafea20118b93f544760c
DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256
6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512
cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c
WHIRLPOOL
b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
DIST apache-tomcat-8.0.24-src.tar.gz 4888751 SHA256
184b0d8bda512204a2e565f9175a13f9772a9d13185e1aa228394b45c641474c SHA512
af5619a63db3d1f6d39eb0290c83a38272c31803ee39a40aebfba5f7a0cf67d830ffcbebe518aff8de4a1f8eb44021975d7e43d45b4bd9804e8ca9cfbfc4904a
WHIRLPOOL
4d37f4d1fe3ee138252813bd4a65025d0ccceea8aec57aa0c9474ad4902f85938627277f6e4ece30793326c31d7790b0ca0b8d99d7b21857519d7c22c28794e8
+DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256
3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512
70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb
WHIRLPOOL
3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc
DIST jakarta-servletapi-src.tar.gz 65342 SHA256
404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512
7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
WHIRLPOOL
beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.26.ebuild
b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.26.ebuild
new file mode 100644
index 000..1c1c74f
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.26.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3 implementation"
+HOMEPAGE="http://tomcat.apache.org/";
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux
~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace
build.xml"
+ rm -fR */*/build.xml
+ einfo "Removing bundled jars and classes"
+ find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+}
+
+src_install() {
+ java-pkg_dojar "${S}"/output/build/lib/*.jar
+ use source && java-pkg_dosrc java/javax/servlet/
+}
[gentoo-commits] repo/gentoo:master commit in: dev-python/python-heatclient/
commit: 3e2dbedfc36253a1e7ee40f53ed42c1d3923397e
Author: Matthew Thode mthode org>
AuthorDate: Thu Sep 3 16:43:50 2015 +
Commit: Matt Thode gentoo org>
CommitDate: Thu Sep 3 16:44:10 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e2dbedf
dev-python/python-heatclient: bup for liberty
Package-Manager: portage-2.2.20.1
dev-python/python-heatclient/Manifest | 4 +-
.../python-heatclient-0.2.12.ebuild| 129 -
.../python-heatclient-0.2.9.ebuild | 57 -
...0.3.0.ebuild => python-heatclient-0.7.0.ebuild} | 44 +++
4 files changed, 25 insertions(+), 209 deletions(-)
diff --git a/dev-python/python-heatclient/Manifest
b/dev-python/python-heatclient/Manifest
index 46f3413..ea5f5fd 100644
--- a/dev-python/python-heatclient/Manifest
+++ b/dev-python/python-heatclient/Manifest
@@ -1,6 +1,4 @@
-DIST python-heatclient-0.2.12.tar.gz 99919 SHA256
e9d5b74206b322ce30184a1b132a78b8be1806be85c77361fb72a966c4c48afe SHA512
49d28e63bf9e7c227443cf58c6870900f2fb23d6f4e0457b97cfdf615af01b95c046759c4d763e8c9ab702f5a85fe79925aa19d905bbb2c4e94eea48e4ca066e
WHIRLPOOL
712aacc7dae4114cd61e02ab22ff50a61b85ddde35cfcfa26fbe02c46ae63808e0c95a13beb5cec9724e3b0fd3b68970123dc679d6cfb765aa0ec57d5d430c82
-DIST python-heatclient-0.2.9.tar.gz 81470 SHA256
8cc6d99f86529633b8b5d99417358fd7c023223572f190ae3e1da09ff435420f SHA512
05fc3a5ff8e738fdc3ac2c5d8221c9be932467aa9109e1138c4a96053f7e68d8ba77b13f50968f05a37e94b60bd5ff2e798faf0c5b145ae80c2a0a6f7f68313a
WHIRLPOOL
1c77ac1329c6f5dc1c207670d5864ea44046d6a0686b12c373ad2a26560999fc0bdc011b8efaf431f9c6f5379d19eb9bb65b68fb08a7297f12ec6e0313ce1846
-DIST python-heatclient-0.3.0.tar.gz 95621 SHA256
c3fe26b69610dcd1540f5ab2c8ae59183c3df09d9ede52a5bb704977345f29ad SHA512
f550e785ce21e1a1ad8dedfb1fc94bdaf4e0d9b5902c05a704b73c72e3e49ac6e35f79acbbc8ac511bca329d5032f796447899dfa737da0f7b8b376e5983153a
WHIRLPOOL
9a02d508401600a659f552d2c7b46d7a4c94500514ff3763bd47ecfefa2fcc89cf49b20bbfbdb859a04fe4c719bcbdceb29d15cc793f631c89192a03642a2b3f
DIST python-heatclient-0.4.0.tar.gz 104613 SHA256
1b71e2bb5c380ac6b2e1f07b48b7b3e82e7364cc43255ed696c795ab5f8d5a1d SHA512
f1235e40d6407fc05f53dfa1592d4f1fa72c10c6aa17fcbb78a7a8bf999cf803f4a42f9f7672f403d336006bdb72f3960d849474c398e592085f1d637a28faed
WHIRLPOOL
680af36f92f9674667cf1ad97167248e3b30b4fc828065bd9f2dd7ecef4fd7dcd03729c5d257d8f31ce42184764bcea1d4c4aaee37d53ac63e1e44183c694f84
DIST python-heatclient-0.5.0.tar.gz 104320 SHA256
b64eadecea1ecab5b69c1f51ddd157d53d218dea1360c201843f28a052cb3dbf SHA512
97ac1bb3ef1ca82730650e42dffa5dec2f1f37fac63c38a8c2de87b2ccf772b905749f4e9211831ec92871ebaee57a5094a4a1005e7391823a6dee27b0592dd8
WHIRLPOOL
fc90b7a21d70c9044cdb39d626584192dcc347f531f0dc83b5b349d8731b7e3e0278586f5dcec32d9be10d02a6a6cb53175c6088fc43857b9b874a979da77de2
DIST python-heatclient-0.6.0.tar.gz 109553 SHA256
fe293e11d145d86b92649063eb50d1f599dab88a327707d76a72b12022b77bbb SHA512
04b8836c212a8825b6ffb839715df881189a08e3c587762a661744bdd730d6aaf99c9e3497642011b0696692c856e12131bc8d1ff6a69cb88ae5b48aa3872b39
WHIRLPOOL
683497a0363ce636499af5866838242ef1fc2769c54d5ddf32e8dcfd5d0d2f3b648d46c0bb59c14bf1043875bf65ec99b090add1a289c9c95d383ce5ba918e3f
+DIST python-heatclient-0.7.0.tar.gz 119131 SHA256
6f58a3c759056dbcbf071e1707d6649e6d15cfc710daa1b98e9703b83a4a01c2 SHA512
5c9f12b08abaa9ff07a0dd72ceef7b205ae2afeb4d8900b2e1c3f709fc6df63f56f9d31b45acc17cfb51a1ec849bd3cd271877d9489c40d665488346531c97f0
WHIRLPOOL
0c911dca2dd48229c83ff83bcfa699d07e0ea39b3bbfff5bd3e3e7fbe62fa747ade252bb7ad320334c4bc9fd481c2c528058368d8828e56c20c0254105559035
diff --git a/dev-python/python-heatclient/python-heatclient-0.2.12.ebuild
b/dev-python/python-heatclient/python-heatclient-0.2.12.ebuild
deleted file mode 100644
index 9212361..000
--- a/dev-python/python-heatclient/python-heatclient-0.2.12.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-DISTUTILS_IN_SOURCE_BUILD=TRUE # Needed due to versioned test patches
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Orchestration API Client Library"
-HOMEPAGE="http://www.openstack.org/";
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# NOTE: doc is broken due to pbr requiring a git checkout
-
-# NOTE: dev-python/discover is not used in tests
-# dev-python/discover[${PYTHON_USEDEP}]
-
-CDEPEND="
- >=dev-python/pbr-0.6[${PYTHON_USEDEP}]
- !~dev-python/pbr-0.7[${PYTHON_USEDEP}]
- https://bugs.launchpad.net/python-heatclient/+bug/1313257
- ebegin 'patching heatclient/tests/test_common_http.py'
- sed \
- -e '651,/def/ d' \
- -i heatclient/tests/test_common_http.py
- STATUS=$?
[gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-servlet-api/
commit: f121bc37665c8ee7428ee826e9ed01c997c4cdb6
Author: Miroslav Šulc gentoo org>
AuthorDate: Thu Sep 3 16:45:39 2015 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Thu Sep 3 16:46:07 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f121bc37
dev-java/tomcat-servlet-api: version bump
Package-Manager: portage-2.2.20.1
dev-java/tomcat-servlet-api/Manifest | 1 +
.../tomcat-servlet-api-7.0.64.ebuild | 35 ++
2 files changed, 36 insertions(+)
diff --git a/dev-java/tomcat-servlet-api/Manifest
b/dev-java/tomcat-servlet-api/Manifest
index 89f0146..7f88c33 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -4,6 +4,7 @@ DIST apache-tomcat-5.5.34-src.tar.gz 3720299 SHA256
a52e7f2abf0fbdd9665ca398d2b3
DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256
c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512
0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be
WHIRLPOOL
c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256
3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512
acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb
WHIRLPOOL
4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
DIST apache-tomcat-7.0.63-src.tar.gz 4577737 SHA256
443aa92f2668906fb24cc43ba952068240f445df637a6e5da8d4661527536657 SHA512
677b28aa0131d309aed83afc73a778c16fd27a187e971ea6929b9b6b65268caa2a67cc468b15565a7d5944a60e8528cc26c82437b476ebc41ff9556367349d8a
WHIRLPOOL
a208ac63ed6f7ce7ac23674d8bb20d523b3fb5d10dfb46d292004f9b296986c4cab690f0252ad53bb4c625c3f58e04b9ddcda5a580fdafea20118b93f544760c
+DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256
d805dec3b387a244c4285ce1f9fc5028bb836716db52f1b1b5036a97dd9ec4dc SHA512
180479b0f5b5604597f850676235fab1f3e63051b503cfa3b4da1e6820505dece73f502249b6e032cfaaad18c9e2d4c057c9854ae5cbf088b214b51e0687ed8c
WHIRLPOOL
a461d7deae890227052bd83ac97c698821b1f6d6ff97c179b124de9b1b7ccdf1498651a391a03008b840fac730c080682f207db4d44e76d15dba63b266ddee51
DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256
6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512
cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c
WHIRLPOOL
b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
DIST apache-tomcat-8.0.24-src.tar.gz 4888751 SHA256
184b0d8bda512204a2e565f9175a13f9772a9d13185e1aa228394b45c641474c SHA512
af5619a63db3d1f6d39eb0290c83a38272c31803ee39a40aebfba5f7a0cf67d830ffcbebe518aff8de4a1f8eb44021975d7e43d45b4bd9804e8ca9cfbfc4904a
WHIRLPOOL
4d37f4d1fe3ee138252813bd4a65025d0ccceea8aec57aa0c9474ad4902f85938627277f6e4ece30793326c31d7790b0ca0b8d99d7b21857519d7c22c28794e8
DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256
3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512
70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb
WHIRLPOOL
3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.64.ebuild
b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.64.ebuild
new file mode 100644
index 000..eee41e5
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.64.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="http://tomcat.apache.org/";
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd
~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace
build.xml"
+ rm -fR */*/build.xml ||die
+ find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
|| die
+}
+
+src_install() {
+ java-pkg_dojar "${S}"/output/build/lib/*.jar
+ use source && java-pkg_dosrc java/javax/servlet/
+}
[gentoo-commits] proj/catalyst:master commit in: targets/support/, targets/stage1/
commit: 6d795daf6d86779b17206f8a558bfcac44822a6b
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Thu Sep 3 16:49:55 2015 +
Commit: Richard Farina gentoo org>
CommitDate: Thu Sep 3 16:49:55 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6d795daf
handle clst_BINDIST properly in stage1
revert 306d797509244bf3508def0aa6c1bbcdfb6e1257 and avoid double setting
bindist during stage1 (cleanliness)
targets/stage1/stage1-chroot.sh | 3 ++-
targets/support/chroot-functions.sh | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 91ab1fa..f77bd9f 100755
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -6,7 +6,8 @@ source /tmp/chroot-functions.sh
export clst_buildpkgs="$(/tmp/build.py)"
# Setup our environment
-BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
+[ -n "${clst_BINDIST}" ] && BINDIST="bindist"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} ${BINDIST}"
FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
diff --git a/targets/support/chroot-functions.sh
b/targets/support/chroot-functions.sh
index 2986ae7..91a2b5f 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -167,7 +167,8 @@ setup_gcc(){
setup_pkgmgr(){
# Set bindist USE flag if clst_BINDIST is set
- [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
+ [ "${clst_target}" != "stage1" ] && [ -e "${clst_make_conf}" ] \
+ && [ -n "${clst_BINDIST}" ] && echo "USE=\"\${USE} bindist\""
>> "${clst_make_conf}"
# We need to merge our package manager with USE="build" set in case it
is
# portage to avoid frying our /etc/portage/make.conf file. Otherwise,
we could
[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
commit: c65a30c63935be2101dd2b2e33f861ecbe92fe63
Author: Miroslav Šulc gentoo org>
AuthorDate: Thu Sep 3 16:50:32 2015 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Thu Sep 3 16:50:32 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c65a30c6
www-servers/tomcat: version bump
Package-Manager: portage-2.2.20.1
www-servers/tomcat/Manifest| 1 +
.../tomcat/files/tomcat-7.0.64-build.xml.patch | 149 +
www-servers/tomcat/tomcat-7.0.64.ebuild| 146
3 files changed, 296 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 1b82f42..c486b11 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,6 @@
DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256
c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512
0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be
WHIRLPOOL
c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256
3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512
acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb
WHIRLPOOL
4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
DIST apache-tomcat-7.0.63-src.tar.gz 4577737 SHA256
443aa92f2668906fb24cc43ba952068240f445df637a6e5da8d4661527536657 SHA512
677b28aa0131d309aed83afc73a778c16fd27a187e971ea6929b9b6b65268caa2a67cc468b15565a7d5944a60e8528cc26c82437b476ebc41ff9556367349d8a
WHIRLPOOL
a208ac63ed6f7ce7ac23674d8bb20d523b3fb5d10dfb46d292004f9b296986c4cab690f0252ad53bb4c625c3f58e04b9ddcda5a580fdafea20118b93f544760c
+DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256
d805dec3b387a244c4285ce1f9fc5028bb836716db52f1b1b5036a97dd9ec4dc SHA512
180479b0f5b5604597f850676235fab1f3e63051b503cfa3b4da1e6820505dece73f502249b6e032cfaaad18c9e2d4c057c9854ae5cbf088b214b51e0687ed8c
WHIRLPOOL
a461d7deae890227052bd83ac97c698821b1f6d6ff97c179b124de9b1b7ccdf1498651a391a03008b840fac730c080682f207db4d44e76d15dba63b266ddee51
DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256
6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512
cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c
WHIRLPOOL
b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
DIST apache-tomcat-8.0.24-src.tar.gz 4888751 SHA256
184b0d8bda512204a2e565f9175a13f9772a9d13185e1aa228394b45c641474c SHA512
af5619a63db3d1f6d39eb0290c83a38272c31803ee39a40aebfba5f7a0cf67d830ffcbebe518aff8de4a1f8eb44021975d7e43d45b4bd9804e8ca9cfbfc4904a
WHIRLPOOL
4d37f4d1fe3ee138252813bd4a65025d0ccceea8aec57aa0c9474ad4902f85938627277f6e4ece30793326c31d7790b0ca0b8d99d7b21857519d7c22c28794e8
diff --git a/www-servers/tomcat/files/tomcat-7.0.64-build.xml.patch
b/www-servers/tomcat/files/tomcat-7.0.64-build.xml.patch
new file mode 100644
index 000..481591f
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.64-build.xml.patch
@@ -0,0 +1,149 @@
+diff -Naur apache-tomcat-7.0.63-src.orig/build.xml
apache-tomcat-7.0.63-src/build.xml
+--- apache-tomcat-7.0.63-src.orig/build.xml2015-06-30 09:15:44.0
+0100
apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
+@@ -660,12 +660,14 @@
+
+
+
++
+
+
+
+@@ -721,26 +723,32 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+
++
+
+
++
+
+
++
+
+
+
+
++
+
+
+
+@@ -1051,14 +1061,15 @@
+
+
+
++
+
+
+-
++
+
+
+
++ description="Prepare to build web services extras package"
unless="noget">
+
+
+
+@@ -1886,6 +1897,7 @@
+ description="Create the Tomcat javadoc" >
+
++
+
+
+
++
+
+ http://docs.oracle.com/javase/7/docs/api/"/>
+ http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2642,7 +2657,7 @@
+
+
+
++ description="Download (and build) components necessary to compile"
unless="noget">
+
+
+
+@@ -2699,7 +2714,7 @@
+
+
+
++ description="Download additional components for the tests"
unless="noget">
+
+
+
+@@ -2727,7 +2742,7 @@
+
+
+
++ description="Download additional components for a distribution"
unless="noget">
+
+
+
diff --git a/www-servers/tomcat/tomcat-7.0.64.ebuild
b/www-servers/tomcat/tomcat-7.0.64.ebuild
new file mode 100644
index 000..ec08f2d
--- /dev/null
+++ b/www-servers
[gentoo-commits] repo/gentoo:master commit in: dev-python/pyDeComp/
commit: a76e5418e340a9012bcb87b75d6c2a5f355e03af
Author: Brian Dolbec gentoo org>
AuthorDate: Thu Sep 3 16:49:37 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Sep 3 16:53:08 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a76e5418
dev-python/pyDeComp: New package, initial live ebuild
Package-Manager: portage-2.2.20
dev-python/pyDeComp/metadata.xml | 18 +
dev-python/pyDeComp/pyDeComp-.ebuild | 45
2 files changed, 63 insertions(+)
diff --git a/dev-python/pyDeComp/metadata.xml b/dev-python/pyDeComp/metadata.xml
new file mode 100644
index 000..5b985b6
--- /dev/null
+++ b/dev-python/pyDeComp/metadata.xml
@@ -0,0 +1,18 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+ releng
+
+ dol...@gentoo.org
+ Brian Dolbec
+
+ A python interface library for common compression ,
+ decompression and contents generation. It aims to create a
simple,
+ easily extended and configurable common interface to various
compressison
+ routines. It can easily be extended with with custom
compression,
+ decompression, and contents definitions.
+
+
+ dol-sen/pyDeComp
+
+
diff --git a/dev-python/pyDeComp/pyDeComp-.ebuild
b/dev-python/pyDeComp/pyDeComp-.ebuild
new file mode 100644
index 000..bce3935
--- /dev/null
+++ b/dev-python/pyDeComp/pyDeComp-.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=(python{2_7,3_3,3_4})
+
+EGIT_BRANCH="master"
+
+inherit distutils-r1 python-r1 git-2
+
+EGIT_REPO_URI="git://github.com/dol-sen/pyDeComp.git"
+
+DESCRIPTION="A python interface library for common compression, decompression
and contents handling"
+HOMEPAGE="https://github.com/dol-sen/pyDeComp";
+SRC_URI=""
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+KEYWORDS=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ "
+
+python_install_all() {
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ einfo
+ einfo "This is experimental software."
+ einfo "The API's it installs should be considered unstable"
+ einfo "and are subject to change."
+ einfo
+ einfo "Please file any enhancement requests, or bugs"
+ einfo "at https://github.com/dol-sen/pyDeComp/issues";
+ einfo "I am also on IRC @ #gentoo-releng of the freenode network"
+ einfo
+ ewarn "There may be some python 3 compatibility issues still."
+ ewarn "Please help debug/fix/report them in github or bugzilla."
+}
[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/
commit: 2ac41e1e261320e2436dff0f929dada02f7f50fd
Author: Miroslav Šulc gentoo org>
AuthorDate: Thu Sep 3 16:55:00 2015 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Thu Sep 3 16:55:24 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ac41e1e
www-servers/tomcat: version bump
Package-Manager: portage-2.2.20.1
www-servers/tomcat/Manifest| 1 +
.../tomcat/files/tomcat-8.0.26-build.xml.patch | 265 +
www-servers/tomcat/tomcat-8.0.26.ebuild| 147
3 files changed, 413 insertions(+)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index c486b11..ce0df3b 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,3 +4,4 @@ DIST apache-tomcat-7.0.63-src.tar.gz 4577737 SHA256
443aa92f2668906fb24cc43ba952
DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256
d805dec3b387a244c4285ce1f9fc5028bb836716db52f1b1b5036a97dd9ec4dc SHA512
180479b0f5b5604597f850676235fab1f3e63051b503cfa3b4da1e6820505dece73f502249b6e032cfaaad18c9e2d4c057c9854ae5cbf088b214b51e0687ed8c
WHIRLPOOL
a461d7deae890227052bd83ac97c698821b1f6d6ff97c179b124de9b1b7ccdf1498651a391a03008b840fac730c080682f207db4d44e76d15dba63b266ddee51
DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256
6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512
cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c
WHIRLPOOL
b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
DIST apache-tomcat-8.0.24-src.tar.gz 4888751 SHA256
184b0d8bda512204a2e565f9175a13f9772a9d13185e1aa228394b45c641474c SHA512
af5619a63db3d1f6d39eb0290c83a38272c31803ee39a40aebfba5f7a0cf67d830ffcbebe518aff8de4a1f8eb44021975d7e43d45b4bd9804e8ca9cfbfc4904a
WHIRLPOOL
4d37f4d1fe3ee138252813bd4a65025d0ccceea8aec57aa0c9474ad4902f85938627277f6e4ece30793326c31d7790b0ca0b8d99d7b21857519d7c22c28794e8
+DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256
3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512
70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb
WHIRLPOOL
3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc
diff --git a/www-servers/tomcat/files/tomcat-8.0.26-build.xml.patch
b/www-servers/tomcat/files/tomcat-8.0.26-build.xml.patch
new file mode 100644
index 000..1923d23
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.26-build.xml.patch
@@ -0,0 +1,265 @@
+diff -Naur apache-tomcat-8.0.24-src.orig/build.xml
apache-tomcat-8.0.24-src/build.xml
+--- apache-tomcat-8.0.24-src.orig/build.xml2015-07-01 21:25:21.0
+0100
apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100
+@@ -697,24 +697,29 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+
++
+
++
+
+
++
+
+
+
+-
++
+
+
+
+@@ -1049,7 +1054,7 @@
+
+
+
+-
++
+
+
+
+@@ -1083,7 +1088,7 @@
+
+
+
+-
++
+
+
+
+
+
+-
++
+
+
+
+
++
+
+@@ -1542,7 +1548,7 @@
+
+
++ description="Prepare to build web services extras package"
unless="noget">
+
+
+
+@@ -1681,7 +1687,7 @@
+
+
++ description="Prepare to build web services extras package"
unless="noget">
+
+
+
+@@ -1882,6 +1888,7 @@
+
+
++
+
++ maxmemory="512m" >
+
+
+
+
+
++
+
+ http://docs.oracle.com/javase/7/docs/api/"/>
+ http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2739,7 +2749,7 @@
+
+
+
++ description="Download (and build) components necessary to compile"
unless="noget">
+
+
+
+@@ -2773,7 +2783,7 @@
+
+
+
++ description="Download additional components for the tests"
unless="noget">
+
+
+
+@@ -2819,7 +2829,7 @@
+
+
+
++ description="Download additional components for a distribution"
unless="noget">
+
+
+
+@@ -2845,18 +2855,18 @@
+
+
+
+-
++
+
+
+
+
+-
++
+
+
+
+
+-
++
+
+
+
+@@ -2868,7 +2878,7 @@
+
+
+
+-
++
+
+
+
+@@ -2887,7 +2897,7 @@
+
+
+
+-
++
+
+
+
+@@ -2898,7 +2908,7 @@
+
+
+
+-
++
+
+
+
+@@ -2916,7 +2926,7 @@
+
+
+
+-
++
+
+
+
+@@ -2926,7 +2936,7 @@
+
+
+
+-
++
+
+
+
+@@ -2949,7 +2959,7 @@
+
+
+
+-
++
+
+
+
+@@ -2960,7 +2970,7 @@
+
+
+
+-
++
+
+
+
+@@ -2971,7 +2981,7 @@
+
+
++ de
[gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-opengl/
commit: ed562955446863c388b148db4099a53b54b6c20e Author: Chí-Thanh Christopher Nguyễn gentoo org> AuthorDate: Thu Sep 3 16:55:43 2015 + Commit: Chí-Thanh Christopher Nguyễn gentoo org> CommitDate: Thu Sep 3 16:57:55 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed562955 app-eselect/eselect-opengl: make list of blockers more explicit Package-Manager: portage-2.2.20.1 app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild| 2 ++ app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild | 6 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild b/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild index be23fff..d223eac 100644 --- a/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild +++ b/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild @@ -33,6 +33,8 @@ RDEPEND=">=app-admin/eselect-1.2.4 !=media-libs/mesa-10.3.5-r1 !>=media-libs/mesa-10.3.7-r2 !>=x11-proto/glproto-1.4.17-r1 +!=x11-base/xorg-server-1.12.4-r6 +!=x11-base/xorg-server-1.15.2-r3 !=x11-base/xorg-server-1.16.4-r1 !>=x11-base/xorg-server-1.16.4-r4" diff --git a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild b/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild index 2185e0e..5548068 100644 --- a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild +++ b/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild @@ -30,7 +30,11 @@ RDEPEND=">=app-admin/eselect-1.2.4 !=media-libs/mesa-10.3.5 !=media-libs/mesa-10.3.7-r1 !
[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qmapshack/
commit: 3fa0482341d1a9711700e5eaee060e0d5397acd4
Author: Andrey Grozin gentoo org>
AuthorDate: Thu Sep 3 16:38:02 2015 +
Commit: Andrey Grozin gentoo org>
CommitDate: Thu Sep 3 16:54:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fa04823
sci-geosciences/qmapshack: initial import
Package-Manager: portage-2.2.20.1
sci-geosciences/qmapshack/Manifest | 1 +
sci-geosciences/qmapshack/metadata.xml | 15 +++
sci-geosciences/qmapshack/qmapshack-1.3.0.ebuild | 21 +
3 files changed, 37 insertions(+)
diff --git a/sci-geosciences/qmapshack/Manifest
b/sci-geosciences/qmapshack/Manifest
new file mode 100644
index 000..085cd02
--- /dev/null
+++ b/sci-geosciences/qmapshack/Manifest
@@ -0,0 +1 @@
+DIST qmapshack-1.3.0.tar.gz 4306608 SHA256
8eb9b07e2170d435aa086930e8c12f53cc9f89e7617adcf6a73b5a76f4081b0d SHA512
bf58bc7a2b9612cddb63801737c31b5910f8cbf255ebbc4abac42cb7404040074436ac6fa9a85982a31c1499cedc21fb13885e4daa650eb3567f8115528db385
WHIRLPOOL
d85bbc15df93a9d86c57126f8b8c85dce5e10fcac1ca2b9bb8c32b8abd9f8796e3e4c415d712bf7dc8aa9c8542715f45ca81aca9cfd6d67685fe6984180c5ddd
diff --git a/sci-geosciences/qmapshack/metadata.xml
b/sci-geosciences/qmapshack/metadata.xml
new file mode 100644
index 000..b9960f6
--- /dev/null
+++ b/sci-geosciences/qmapshack/metadata.xml
@@ -0,0 +1,15 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+sci
+
+ gro...@gentoo.org
+ Andrey Grozin
+
+
+ Use QMapShack to plan your next outdoor trip or to visualize and archive
+ all the GPS recordings of your past exciting adventures.
+ QMapShack is the next generation of the famous QLandkarte GT application.
+ And of course it's even better and easier to use.
+
+
diff --git a/sci-geosciences/qmapshack/qmapshack-1.3.0.ebuild
b/sci-geosciences/qmapshack/qmapshack-1.3.0.ebuild
new file mode 100644
index 000..9a118c7
--- /dev/null
+++ b/sci-geosciences/qmapshack/qmapshack-1.3.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="GPS mapping utility"
+HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home";
+SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz";
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwebkit:5
+ dev-qt/linguist-tools:5
+ dev-qt/qtscript:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtdbus:5
+ sci-libs/gdal
+ sci-libs/proj"
+DEPEND="${RDEPEND}"
[gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/, pym/portage/util/, pym/portage/tests/util/, bin/
commit: 717fc43b3b1daa021eca606bbaa59dea5f456163
Author: Mike Frysinger gentoo org>
AuthorDate: Wed Oct 16 20:48:58 2013 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Sep 3 17:41:46 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=717fc43b
xattr: centralize the various shims in one place
Rather than each module implementing its own shim around the various
methods for accessing extended attributes, start a dedicated module
that exports a consistent API.
bin/quickpkg | 12 +-
bin/xattr-helper.py | 11 +-
pym/portage/dbapi/vartree.py | 10 +-
pym/portage/tests/util/test_xattr.py | 178 +++
pym/portage/util/_xattr.py | 228 +++
pym/portage/util/movefile.py | 100 ---
pym/portage/util/xattr.py| 20 ---
7 files changed, 441 insertions(+), 118 deletions(-)
diff --git a/bin/quickpkg b/bin/quickpkg
index 726abff..262fda4 100755
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -21,8 +21,8 @@ from portage.dbapi.dep_expand import dep_expand
from portage.dep import Atom, use_reduce
from portage.exception import (AmbiguousPackageName, InvalidAtom, InvalidData,
InvalidDependString, PackageSetNotFound, PermissionDenied)
-from portage.util import ConfigProtect, ensure_dirs, shlex_split
-import portage.util.xattr as _xattr
+from portage.util import ConfigProtect, ensure_dirs, shlex_split, _xattr
+xattr = _xattr.xattr
from portage.dbapi.vartree import dblink, tar_contents
from portage.checksum import perform_md5
from portage._sets import load_default_config, SETPREFIX
@@ -36,7 +36,7 @@ def quickpkg_atom(options, infos, arg, eout):
vartree = trees["vartree"]
vardb = vartree.dbapi
bintree = trees["bintree"]
- xattr = 'xattr' in settings.features
+ xattrs = 'xattr' in settings.features
include_config = options.include_config == "y"
include_unmodified_config = options.include_unmodified_config == "y"
@@ -137,8 +137,8 @@ def quickpkg_atom(options, infos, arg, eout):
# The tarfile module will write pax headers holding the
# xattrs only if PAX_FORMAT is specified here.
tar = tarfile.open(binpkg_tmpfile, "w:bz2",
- format=tarfile.PAX_FORMAT if xattr else
tarfile.DEFAULT_FORMAT)
- tar_contents(contents, root, tar, protect=protect,
xattr=xattr)
+ format=tarfile.PAX_FORMAT if xattrs else
tarfile.DEFAULT_FORMAT)
+ tar_contents(contents, root, tar, protect=protect,
xattrs=xattrs)
tar.close()
xpak.tbz2(binpkg_tmpfile).recompose_mem(xpdata)
finally:
@@ -238,7 +238,7 @@ def quickpkg_main(options, args, eout):
eout.eerror("No write access to '%s'" % bintree.pkgdir)
return errno.EACCES
- if 'xattr' in portage.settings.features and not hasattr(_xattr,
'getxattr'):
+ if 'xattr' in portage.settings.features and not _xattr.XATTRS_WORKS:
eout.eerror("No xattr support library was found, "
"so xattrs will not be preserved!")
portage.settings.unlock()
diff --git a/bin/xattr-helper.py b/bin/xattr-helper.py
index 3e9b81e..19f25f9 100755
--- a/bin/xattr-helper.py
+++ b/bin/xattr-helper.py
@@ -19,16 +19,7 @@ import re
import sys
from portage.util._argparse import ArgumentParser
-
-if hasattr(os, "getxattr"):
-
- class xattr(object):
- get = os.getxattr
- set = os.setxattr
- list = os.listxattr
-
-else:
- import xattr
+from portage.util._xattr import xattr
_UNQUOTE_RE = re.compile(br'\\[0-7]{3}')
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 927c645..5ba8d9d 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -35,7 +35,7 @@ portage.proxy.lazyimport.lazyimport(globals(),
'portage.util.movefile:movefile',
'portage.util.path:first_existing,iter_parents',
'portage.util.writeable_check:get_ro_checker',
- 'portage.util:xattr@_xattr',
+ 'portage.util._xattr:xattr',
'portage.util._dyn_libs.PreservedLibsRegistry:PreservedLibsRegistry',
'portage.util._dyn_libs.LinkageMapELF:LinkageMapELF@LinkageMap',
'portage.util._async.SchedulerInterface:SchedulerInterface',
@@ -5268,7 +5268,7 @@ def write_contents(contents, root, f):
f.write(line)
def tar_contents(contents, root, tar, protect=None, onProgress=None,
- xattr=False):
+ xattrs=False):
os = _os_merge
encoding = _encodings['merge']
@@ -5390,13 +5390,13 @@ def tar_contents(contents, root, tar, protect=None,
onProgress=None,
encoding=encoding,
[gentoo-commits] proj/portage:master commit in: /
commit: 2b334c2424d669677037c1b82acbc3a464f8012a Author: Mike Frysinger gentoo org> AuthorDate: Thu Sep 3 17:55:44 2015 + Commit: Mike Frysinger gentoo org> CommitDate: Thu Sep 3 17:55:44 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2b334c24 runtests: fix typo in help runtests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtests b/runtests index d1f7b6f..36243c6 100755 --- a/runtests +++ b/runtests @@ -82,7 +82,7 @@ List all the available unittests. $ %(prog)s --list Run against specific versions of python. -$ %(prog)s --python-version '2.7 3.3' +$ %(prog)s --python-versions '2.7 3.3' Run just one unittest. $ %(prog)s pym/portage/tests/xpak/test_decodeint.py
[gentoo-commits] proj/portage:master commit in: pym/_emerge/
commit: 19b17fa0ecd633e2e0d759bc03a74c88c261b44b
Author: Mike Frysinger gentoo org>
AuthorDate: Thu Sep 3 18:00:09 2015 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Sep 3 18:00:09 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=19b17fa0
Scheduler: clean up PORTAGE_TMPDIR warning message
The current textwrap logic produces bad output when expanding the user's
PORTAGE_TMPDIR variable. It's customary to not wrap literal values like
this, especially when it's a user setting, so drop the use of textwrap.
Before:
* The directory specified in your PORTAGE_TMPDIR variable, '/var/tmp/som
* e/really/long/path/that/looks/bad/when/you/break/it/up/but/do/it/anywa
* ys', does not exist. Please create this directory or correct your
* PORTAGE_TMPDIR setting.
After:
* The directory specified in your PORTAGE_TMPDIR variable does not exist:
*
/var/tmp/some/really/long/path/that/looks/bad/when/you/break/it/up/but/do/it/anyways
* Please create this directory or correct your PORTAGE_TMPDIR setting.
pym/_emerge/Scheduler.py | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index 13abc92..8eeef06 100644
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -963,11 +963,11 @@ class Scheduler(PollScheduler):
# for ensuring sane $PWD (bug #239560) and storing elog
messages.
tmpdir = root_config.settings.get("PORTAGE_TMPDIR", "")
if not tmpdir or not os.path.isdir(tmpdir):
- msg = "The directory specified in your " + \
- "PORTAGE_TMPDIR variable, '%s', " %
tmpdir + \
- "does not exist. Please create this " + \
- "directory or correct your PORTAGE_TMPDIR
setting."
- msg = textwrap.wrap(msg, 70)
+ msg = (
+ 'The directory specified in your
PORTAGE_TMPDIR variable does not exist:',
+ tmpdir,
+ 'Please create this directory or
correct your PORTAGE_TMPDIR setting.',
+ )
out = portage.output.EOutput()
for l in msg:
out.eerror(l)
[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedink/
commit: cd2871a0297f5a647741030912f03a7496b12b94
Author: Michael Sterrett gentoo org>
AuthorDate: Thu Sep 3 18:04:25 2015 +
Commit: Michael Sterrett gentoo org>
CommitDate: Thu Sep 3 18:04:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd2871a0
seems like the code is fragile (bug #559548) so drop down to very conservative
CFLAGS
Package-Manager: portage-2.2.20.1
games-rpg/freedink/freedink-108.4.ebuild | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/games-rpg/freedink/freedink-108.4.ebuild
b/games-rpg/freedink/freedink-108.4.ebuild
index 8d47573..dafba42 100644
--- a/games-rpg/freedink/freedink-108.4.ebuild
+++ b/games-rpg/freedink/freedink-108.4.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-inherit games
+inherit flag-o-matic games
DESCRIPTION="Dink Smallwood is an adventure/role-playing game, similar to
Zelda (2D top view)"
HOMEPAGE="http://www.freedink.org/";
@@ -32,6 +32,9 @@ src_prepare() {
sed -i \
-e 's#^datarootdir =.*$#datarootdir = /usr/share#' \
share/Makefile.in || die
+ # seems like the code is fragile (bug #559548)
+ filter-flags
+ replace-flags -O? -O0
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/wxmaxima/
commit: 9fe51b3e036df4f145ce86dbf7348c404ff4d304
Author: Andrey Grozin gentoo org>
AuthorDate: Thu Sep 3 18:09:51 2015 +
Commit: Andrey Grozin gentoo org>
CommitDate: Thu Sep 3 18:09:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fe51b3e
sci-mathematics/wxmaxima: version bump
Package-Manager: portage-2.2.20.1
sci-mathematics/wxmaxima/Manifest| 2 +
sci-mathematics/wxmaxima/wxmaxima-15.08.1.ebuild | 77
2 files changed, 79 insertions(+)
diff --git a/sci-mathematics/wxmaxima/Manifest
b/sci-mathematics/wxmaxima/Manifest
index c48162b..5b02cb4 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -2,3 +2,5 @@ DIST wxMaxima-13.04.2.tar.gz 1652680 SHA256
29352db75dd3ff27393ab0971543fd0b3c3a
DIST wxmaxima-15.04.0.tar.gz 4990313 SHA256
c178067a2f75d91dd378f88b4d0f87af6b2705ca32bea509d63e7347b2a1d21e SHA512
1a899259698da38f97a1859ba0526406cbc654a130dc1d18e01cf248ac4d7292c82cb00dd92ce2fac2c3cfc002788fdef0a6a4f95eca54b9096efc73c6aa45b7
WHIRLPOOL
225456c073b1aa87d2e599b9c63244ff7c97378fb6b5a60fcb8730655d193a0f032b27a1264e12eefb4abf08389f2337a11c380b6d89af2de9a4fb6e14f614dc
DIST wxmaxima-15.08.0-missing.tar.bz2 16172 SHA256
d39d1a7937db05a4ae3e6a6d38a4079e93fb95b5533db7254de7dec7d24527db SHA512
195de1bcc4b469094716e0e417cf6431abe9f67e467c71fe51c4bed9990c613d5487cbcdda18d1df7f50e5e1b0abec7578e1091cc4999d95ba6a5f8849d826e2
WHIRLPOOL
34964f7ba5a1c9e5f2ab05b857c31b441eee43a127dc123337174509c71b7f80313e111b967abba47579021c52f27c71812c85efdf7a8429ad4e1e6c51f62db8
DIST wxmaxima-15.08.0.tar.gz 560 SHA256
e6905b8e306b575e8e38b02a0e81de38be6d154d1349a455e01fbec28b21b27c SHA512
b13df571978c354ef420c613717149e3235bd5343746c12f2193eb0599f417b04cdb01e87e97ef2ed72bfd090b6ec6871c834fdb74074a3d5fb0f68bbe942263
WHIRLPOOL
a2a1ae200eebb6d54a3c96cbd1c304b37c4a759ccc15983b3910d3aad1864d6c80d39e7e688198d4f3dd7c36bb9a8b2795a9610475858207b90482887219906a
+DIST wxmaxima-15.08.1-missing.tar.bz2 14699 SHA256
62a84bf32e61d39f66787a7fb2cdbf67f322ddee2d7734c23650739476e97b17 SHA512
de64163643652a288fd6f65076df94074a28895a13ae8766a1913e12833d3dbb1ae4bbdbcd6a69221e5bde7000b93e3a86a223b1320d25581d32c61ea6ab3b98
WHIRLPOOL
e96dac6ffd227597721a7e8fa200d99422e722ec5d3c1733c29904fdf1f6e2bae2ba1a2c8e98e217e7a089c5857c1ccf5d10950bd98cdbde0dfb19039a60262d
+DIST wxmaxima-15.08.1.tar.gz 5577228 SHA256
82ad5314a88e53ff41dc431afb44ef1a47738686786e8cc8b4c48e0c147f4ffd SHA512
4ab7a8e992904e18e571b716d35f0d5286363b287853e3ebacc64e63df901fe192abdef16db8dc8defabb26a25f8f8956a7bad466862ee0d19d8846d4e3fec94
WHIRLPOOL
492c6ccf79640c9bfdb8d7aad283f5e0941bba8b38d037285712603112026e0feaf8873025657486df44ff718e559d9e690076e78f86e560f5d6b73ecd096ad9
diff --git a/sci-mathematics/wxmaxima/wxmaxima-15.08.1.ebuild
b/sci-mathematics/wxmaxima/wxmaxima-15.08.1.ebuild
new file mode 100644
index 000..cdbdbcd
--- /dev/null
+++ b/sci-mathematics/wxmaxima/wxmaxima-15.08.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+inherit eutils gnome2-utils wxwidgets fdo-mime
+
+DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
+HOMEPAGE="http://andrejv.github.io/wxmaxima/";
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+ https://dev.gentoo.org/~grozin/${P}-missing.tar.bz2";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="
+ dev-libs/libxml2:2
+ x11-libs/wxGTK:${WX_GTK_VER}"
+RDEPEND="${DEPEND}
+ media-fonts/jsmath
+ sci-visualization/gnuplot[wxwidgets]
+ sci-mathematics/maxima"
+
+src_prepare() {
+ local i
+
+ # consistent package names
+ sed -e "s:\${datadir}/wxMaxima:\${datadir}/${PN}:g" \
+ -i Makefile.in data/Makefile.in test/Makefile.in || die "sed
failed"
+
+ sed -e 's:share/wxMaxima:share/wxmaxima:g' \
+ -i src/wxMaxima.cpp src/wxMaximaFrame.cpp src/Dirstructure.cpp
src/Dirstructure.h \
+ || die "sed failed"
+
+ # correct gettext behavior
+ if [[ -n "${LINGUAS+x}" ]] ; then
+ for i in $(cd "${S}"/locales ; echo *.mo) ; do
+ if ! has ${i%.mo} ${LINGUAS} ; then
+ sed -i \
+ -e "/^WXMAXIMA_LINGUAS/s# ${i%.mo}##" \
+ -e "/^WXWIN_LINGUAS/s# ${i%.mo}##" \
+ locales/Makefile.in || die
+ fi
+ done
+ fi
+}
+
+src_configure() {
+ econf \
+ --enable-printing \
+ --with-wx-config=${WX_CONFIG}
+}
+
+src_install () {
+ default
+ doicon -s 128 data/wxmaxima.png
+ make_desktop_entry wxmaxima wxMaxima wxmaxima
+ dosym /usr/share/${PN}/README /usr/share/doc/${PF}/README
+}
+
+pkg_pr
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/
commit: 7442516a9e82c154de48ff3812fa58d5f632217e
Author: Michael Sterrett gentoo org>
AuthorDate: Thu Sep 3 18:25:21 2015 +
Commit: Michael Sterrett gentoo org>
CommitDate: Thu Sep 3 18:25:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7442516a
fix building with gcc52 with patch from Sven Eden via bug #559472
Package-Manager: portage-2.2.20.1
dev-games/ogre/files/ogre-1.9.0-gcc52.patch| 63 ++
.../ogre-1.9.0-remove_media_path_to_bindir.patch | 4 +-
...ogre-1.9.0-remove_resource_path_to_bindir.patch | 4 +-
dev-games/ogre/ogre-1.9.0-r1.ebuild| 6 ++-
4 files changed, 71 insertions(+), 6 deletions(-)
diff --git a/dev-games/ogre/files/ogre-1.9.0-gcc52.patch
b/dev-games/ogre/files/ogre-1.9.0-gcc52.patch
new file mode 100644
index 000..030368d
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.9.0-gcc52.patch
@@ -0,0 +1,63 @@
+--- a/OgreMain/include/OgreProgressiveMeshGenerator.h
b/OgreMain/include/OgreProgressiveMeshGenerator.h
+@@ -215,7 +215,40 @@
+ void tuneContainerSize();
+ void addVertexData(VertexData* vertexData, bool useSharedVertexLookup);
+ template
+- void addIndexDataImpl(IndexType* iPos, const IndexType* iEnd,
VertexLookupList& lookup, unsigned short submeshID);
++ void addIndexDataImpl(IndexType* iPos, const IndexType* iEnd,
VertexLookupList& lookup, unsigned short submeshID)
++ {
++
++ // Loop through all triangles and connect them to the vertices.
++ for (; iPos < iEnd; iPos += 3) {
++ // It should never reallocate or every pointer will be
invalid.
++ OgreAssert(mTriangleList.capacity() >
mTriangleList.size(), "");
++ mTriangleList.push_back(PMTriangle());
++ PMTriangle* tri = &mTriangleList.back();
++ tri->isRemoved = false;
++ tri->submeshID = submeshID;
++ for (int i = 0; i < 3; i++) {
++ // Invalid index: Index is bigger then vertex
buffer size.
++ OgreAssert(iPos[i] < lookup.size(), "");
++ tri->vertexID[i] = iPos[i];
++ tri->vertex[i] = lookup[iPos[i]];
++ }
++ if (tri->isMalformed()) {
++#if OGRE_DEBUG_MODE
++ stringstream str;
++ str << "In " << mMeshName << " malformed
triangle found with ID: " << getTriangleID(tri) << ". " <<
++ std::endl;
++ printTriangle(tri, str);
++ str << "It will be excluded from LOD level
calculations.";
++ LogManager::getSingleton().stream() <<
str.str();
++#endif
++ tri->isRemoved = true;
++ mIndexBufferInfoList[tri->submeshID].indexCount
-= 3;
++ continue;
++ }
++ tri->computeNormal();
++ addTriangleToEdges(tri);
++ }
++ }
+ void addIndexData(IndexData* indexData, bool useSharedVertexLookup,
unsigned short submeshID);
+
+ void computeCosts();
+--- a/OgreMain/src/OgreProgressiveMeshGenerator.cpp
b/OgreMain/src/OgreProgressiveMeshGenerator.cpp
+@@ -219,6 +219,8 @@
+ }
+ vbuf->unlock();
+ }
++/// Called from OgreQueuedProgressiveMeshGenerator.cpp, so it can not be
defined in here.
++#if 0
+ template
+ void ProgressiveMeshGenerator::addIndexDataImpl(IndexType* iPos, const
IndexType* iEnd,
+ VertexLookupList& lookup,
+@@ -256,6 +258,7 @@
+ addTriangleToEdges(tri);
+ }
+ }
++#endif // 0
+
+ void ProgressiveMeshGenerator::addIndexData(IndexData* indexData, bool
useSharedVertexLookup, unsigned short submeshID)
+ {
diff --git a/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch
b/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch
index 9af7685..bb2ca55 100644
--- a/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch
+++ b/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch
@@ -1,5 +1,5 @@
a/CMake/InstallResources.cmake 2014-10-29 12:43:49.0 +0100
-+++ b/CMake/InstallResources.cmake 2014-10-29 12:46:10.017611431 +0100
+--- a/CMake/InstallResources.cmake
b/CMake/InstallResources.cmake
@@ -178,10 +178,6 @@
# CREATE CONFIG FILES - BUILD DIR VERSIONS
diff --git
a/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch
b/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch
index d737628..a26aa3f 100644
--- a/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch
+++ b/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/
commit: b4984251d983fd2bab88c967a452a5b251937a87
Author: Andrey Grozin gentoo org>
AuthorDate: Thu Sep 3 18:42:17 2015 +
Commit: Andrey Grozin gentoo org>
CommitDate: Thu Sep 3 18:42:17 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4984251
sci-mathematics/maxima: fixing a bug in clozurecl maxima
Package-Manager: portage-2.2.20.1
sci-mathematics/maxima/files/db-0.patch| 20 +++
sci-mathematics/maxima/maxima-5.37.1-r1.ebuild | 190 +
2 files changed, 210 insertions(+)
diff --git a/sci-mathematics/maxima/files/db-0.patch
b/sci-mathematics/maxima/files/db-0.patch
new file mode 100644
index 000..d6cc186
--- /dev/null
+++ b/sci-mathematics/maxima/files/db-0.patch
@@ -0,0 +1,20 @@
+diff -r -U2 maxima-5.37.1.orig/src/db.lisp maxima-5.37.1/src/db.lisp
+--- maxima-5.37.1.orig/src/db.lisp 2015-08-11 01:01:13.0 +0600
maxima-5.37.1/src/db.lisp 2015-09-04 00:21:43.596685564 +0600
+@@ -389,10 +389,14 @@
+
+ (defmfun isp (pat)
+- (let ((isp 'unknown))
++ (let ((isp 'unknown) #+ccl (err t))
+ (ignore-errors
+ (setq isp
+ (cond ((truep pat))
+ ((falsep pat) nil)
+-(t 'unknown
++(t 'unknown)))
++ (setq err nil))
++#+ccl
++(when err
++ (setq +labs nil))
+ isp))
+
diff --git a/sci-mathematics/maxima/maxima-5.37.1-r1.ebuild
b/sci-mathematics/maxima/maxima-5.37.1-r1.ebuild
new file mode 100644
index 000..8f2f164
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.37.1-r1.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools elisp-common eutils
+
+DESCRIPTION="Free computer algebra environment based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/";
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+# Supported lisps
+LISPS=( sbcl cmucl gcl ecls clozurecl clisp )
+# supports readline: . - no, y - yes
+SUPP_RL=( .. y .. y )
+# . - just --enable-, - --enable-
+CONF_FLAG=( .. . ecl ccl . )
+# patch file version; . - no patch
+PATCH_V=( 11 . 22 1 )
+
+IUSE="latex emacs tk nls unicode xemacs X ${LISPS[*]}"
+
+# Languages
+LANGS="es pt pt_BR"
+for lang in ${LANGS}; do
+ IUSE="${IUSE} linguas_${lang}"
+done
+
+RDEPEND="X? ( x11-misc/xdg-utils
+sci-visualization/gnuplot[gd]
+tk? ( dev-lang/tk:0 ) )
+ latex? ( virtual/latex-base )
+ emacs? ( virtual/emacs
+ latex? ( app-emacs/auctex ) )
+ xemacs? ( app-editors/xemacs
+ latex? ( app-emacs/auctex ) )"
+
+PDEPEND="emacs? ( app-emacs/imaxima )"
+
+# generating lisp dependencies
+depends() {
+ local LISP DEP
+ LISP=${LISPS[$1]}
+ DEP="dev-lisp/${LISP}:="
+ if [ "${SUPP_RL[$1]}" = "." ]; then
+ DEP="${DEP} app-misc/rlwrap"
+ fi
+ echo ${DEP}
+}
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+ LISP=${LISPS[${n}]}
+ RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
+ if (( ${n} > 0 )); then
+ DEF_DEP="${DEF_DEP} !${LISP}? ( "
+ fi
+done
+
+# default lisp
+if use arm; then
+ DEF_LISP=2 # gcl
+else
+ DEF_LISP=0 # sbcl
+fi
+
+DEF_DEP="${DEF_DEP} `depends ${DEF_LISP}`"
+
+n=${#LISPS[*]}
+for ((n--; n > 0; n--)); do
+ DEF_DEP="${DEF_DEP} )"
+done
+
+unset LISP
+
+RDEPEND="${RDEPEND}
+ ${DEF_DEP}"
+
+DEPEND="${RDEPEND}
+ sys-apps/texinfo"
+
+TEXMF="${EPREFIX}"/usr/share/texmf-site
+
+pkg_setup() {
+ local n=${#LISPS[*]}
+
+ for ((n--; n >= 0; n--)); do
+ use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
+ done
+
+ if [ -z "${NLISPS}" ]; then
+ ewarn "No lisp specified in USE flags, choosing
${LISPS[${DEF_LISP}]} as default"
+ NLISPS=${DEF_LISP}
+ fi
+}
+
+src_prepare() {
+ local n PATCHES v
+ PATCHES=( imaxima-0 rmaxima-0 wish-1 xdg-utils-0 db-0 )
+
+ n=${#PATCHES[*]}
+ for ((n--; n >= 0; n--)); do
+ epatch "${FILESDIR}"/${PATCHES[${n}]}.patch
+ done
+
+ n=${#LISPS[*]}
+ for ((n--; n >= 0; n--)); do
+ v=${PATCH_V[${n}]}
+ if [ "${v}" != "." ]; then
+ epatch "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
+ fi
+ done
+
+ # bug #343331
+ rm share/Makefile.in || die
+ rm src/Makefile.in || die
+ touch src/*.mk
+ touch src/Makefile.am
+ eautoreconf
+}
+
+src_configure() {
+ local CONFS CONF n lang
+ for n in ${NLISPS}; do
+ CONF=${CONF_FLAG[${n}]}
+ if [ ${CONF} = . ]; then
+
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/
commit: 88b4c5c1a694ab3af8b93f07dcdedd594746a229
Author: Andrey Grozin gentoo org>
AuthorDate: Thu Sep 3 18:52:51 2015 +
Commit: Andrey Grozin gentoo org>
CommitDate: Thu Sep 3 18:52:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88b4c5c1
sci-mathematics/maxima: removing the unfixed version
sci-mathematics/maxima/maxima-5.37.1.ebuild | 190
1 file changed, 190 deletions(-)
diff --git a/sci-mathematics/maxima/maxima-5.37.1.ebuild
b/sci-mathematics/maxima/maxima-5.37.1.ebuild
deleted file mode 100644
index a0988d8..000
--- a/sci-mathematics/maxima/maxima-5.37.1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools elisp-common eutils
-
-DESCRIPTION="Free computer algebra environment based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-# Supported lisps
-LISPS=( sbcl cmucl gcl ecls clozurecl clisp )
-# supports readline: . - no, y - yes
-SUPP_RL=( .. y .. y )
-# . - just --enable-, - --enable-
-CONF_FLAG=( .. . ecl ccl . )
-# patch file version; . - no patch
-PATCH_V=( 11 . 22 1 )
-
-IUSE="latex emacs tk nls unicode xemacs X ${LISPS[*]}"
-
-# Languages
-LANGS="es pt pt_BR"
-for lang in ${LANGS}; do
- IUSE="${IUSE} linguas_${lang}"
-done
-
-RDEPEND="X? ( x11-misc/xdg-utils
-sci-visualization/gnuplot[gd]
-tk? ( dev-lang/tk:0 ) )
- latex? ( virtual/latex-base )
- emacs? ( virtual/emacs
- latex? ( app-emacs/auctex ) )
- xemacs? ( app-editors/xemacs
- latex? ( app-emacs/auctex ) )"
-
-PDEPEND="emacs? ( app-emacs/imaxima )"
-
-# generating lisp dependencies
-depends() {
- local LISP DEP
- LISP=${LISPS[$1]}
- DEP="dev-lisp/${LISP}:="
- if [ "${SUPP_RL[$1]}" = "." ]; then
- DEP="${DEP} app-misc/rlwrap"
- fi
- echo ${DEP}
-}
-
-n=${#LISPS[*]}
-for ((n--; n >= 0; n--)); do
- LISP=${LISPS[${n}]}
- RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
- if (( ${n} > 0 )); then
- DEF_DEP="${DEF_DEP} !${LISP}? ( "
- fi
-done
-
-# default lisp
-if use arm; then
- DEF_LISP=2 # gcl
-else
- DEF_LISP=0 # sbcl
-fi
-
-DEF_DEP="${DEF_DEP} `depends ${DEF_LISP}`"
-
-n=${#LISPS[*]}
-for ((n--; n > 0; n--)); do
- DEF_DEP="${DEF_DEP} )"
-done
-
-unset LISP
-
-RDEPEND="${RDEPEND}
- ${DEF_DEP}"
-
-DEPEND="${RDEPEND}
- sys-apps/texinfo"
-
-TEXMF="${EPREFIX}"/usr/share/texmf-site
-
-pkg_setup() {
- local n=${#LISPS[*]}
-
- for ((n--; n >= 0; n--)); do
- use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
- done
-
- if [ -z "${NLISPS}" ]; then
- ewarn "No lisp specified in USE flags, choosing
${LISPS[${DEF_LISP}]} as default"
- NLISPS=${DEF_LISP}
- fi
-}
-
-src_prepare() {
- local n PATCHES v
- PATCHES=( imaxima-0 rmaxima-0 wish-1 xdg-utils-0 )
-
- n=${#PATCHES[*]}
- for ((n--; n >= 0; n--)); do
- epatch "${FILESDIR}"/${PATCHES[${n}]}.patch
- done
-
- n=${#LISPS[*]}
- for ((n--; n >= 0; n--)); do
- v=${PATCH_V[${n}]}
- if [ "${v}" != "." ]; then
- epatch "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
- fi
- done
-
- # bug #343331
- rm share/Makefile.in || die
- rm src/Makefile.in || die
- touch src/*.mk
- touch src/Makefile.am
- eautoreconf
-}
-
-src_configure() {
- local CONFS CONF n lang
- for n in ${NLISPS}; do
- CONF=${CONF_FLAG[${n}]}
- if [ ${CONF} = . ]; then
- CONF=${LISPS[${n}]}
- fi
- CONFS="${CONFS} --enable-${CONF}"
- done
-
- # enable existing translated doc
- if use nls; then
- for lang in ${LANGS}; do
- if use "linguas_${lang}"; then
- CONFS="${CONFS} --enable-lang-${lang}"
- use unicode && CONFS="${CONFS}
--enable-lang-${lang}-utf8"
- fi
- done
- fi
-
- econf ${CONFS} $(use_with tk wish)
--with-lispdir="${EPREFIX}/${SITELISP}"/${PN}
-}
-
-src_install() {
- docompress -x /usr/share/info
- emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
-
- use tk && make_desktop_entry xmaxima xmaxima \
- /usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
- "Science;Math;Education"
-
- if use latex; th
[gentoo-commits] repo/gentoo:master commit in: games-roguelike/adom/
commit: 794fbbe7ad3a6846abc73e69c25bc0484aac958c
Author: Michael Sterrett gentoo org>
AuthorDate: Thu Sep 3 18:59:51 2015 +
Commit: Michael Sterrett gentoo org>
CommitDate: Thu Sep 3 19:00:04 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=794fbbe7
make sure we get ncurses5 api (bug #559072) with inline patch from Sergei
Trofimovich
Package-Manager: portage-2.2.20.1
games-roguelike/adom/adom-1.1.1-r1.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/games-roguelike/adom/adom-1.1.1-r1.ebuild
b/games-roguelike/adom/adom-1.1.1-r1.ebuild
index af8ecd1..83d5f81 100644
--- a/games-roguelike/adom/adom-1.1.1-r1.ebuild
+++ b/games-roguelike/adom/adom-1.1.1-r1.ebuild
@@ -16,7 +16,9 @@ IUSE=""
RESTRICT="strip" #bug #137340
QA_FLAGS_IGNORED="${GAMES_PREFIX_OPT:1}/bin/adom"
-RDEPEND=">=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]"
+RDEPEND="|| (
+ >=sys-libs/ncurses-5.9-r3:0/5[abi_x86_32(-)]
+ >=sys-libs/ncurses-5.9-r3:5/5[abi_x86_32(-)] )"
S=${WORKDIR}/${PN}
[gentoo-commits] proj/kde:master commit in: /
commit: ebf77c4ff452d362597823304985cf0faee3f393 Author: Michael Palimaka gentoo org> AuthorDate: Thu Sep 3 19:02:05 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Sep 3 19:02:12 2015 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ebf77c4f .travis.yml: only report failures. For testing the new notification bot. .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 73030e3..a273e62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,8 @@ script: # You can append own scripts after this line notifications: irc: +on_success: never +on_failure: always channels: - "chat.freenode.net#gentoo-kde" template:
[gentoo-commits] proj/kde:master commit in: kde-apps/kde-apps-meta/
commit: 9597cff6608c95a091b81a7734e04000d502521c Author: Michael Palimaka gentoo org> AuthorDate: Thu Sep 3 18:55:11 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Sep 3 18:55:11 2015 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9597cff6 kde-apps/kde-apps-meta: kdetoys is gone Package-Manager: portage-2.2.20.1 kde-apps/kde-apps-meta/kde-apps-meta-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-.ebuild index 208f017..4fde36e 100644 --- a/kde-apps/kde-apps-meta/kde-apps-meta-.ebuild +++ b/kde-apps/kde-apps-meta/kde-apps-meta-.ebuild @@ -22,7 +22,6 @@ RDEPEND=" $(add_kdeapps_dep kdegraphics-meta) $(add_kdeapps_dep kdemultimedia-meta) $(add_kdeapps_dep kdenetwork-meta) - $(add_kdeapps_dep kdetoys-meta) $(add_kdeapps_dep kdeutils-meta) accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta) ) nls? (
[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-nm/
commit: 9ff3b40acc97daeaace8b3bb496d0e55732eded5
Author: Andreas Sturmlechner gmail com>
AuthorDate: Wed Sep 2 15:42:50 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Sep 3 19:25:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff3b40a
kde-plasma/plasma-nm: Fix RDEPEND !{kde-base => kde-misc}/plasma-nm
File collisions:
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement-kded.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_l2tpui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_openconnectui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_openswanui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_openvpnui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_pptpui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_strongswanui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_vpncui.mo
Package-Manager: portage-2.2.20.1
kde-plasma/plasma-nm/plasma-nm-5.4.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.4.0.ebuild
b/kde-plasma/plasma-nm/plasma-nm-5.4.0.ebuild
index 258e568..8c6fb4c 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.4.0.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.4.0.ebuild
@@ -50,7 +50,7 @@ DEPEND="
)
"
RDEPEND="${DEPEND}
- !kde-base/plasma-nm
+ !kde-misc/plasma-nm
"
src_configure() {
[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/
commit: baa1be65ffefce5bbd9b7b186de3eb3e6117e7e6
Author: Andreas Sturmlechner gmail com>
AuthorDate: Thu Sep 3 19:28:01 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Sep 3 19:28:47 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=baa1be65
kde-plasma/plasma-nm: Fix RDEPEND !{kde-base => kde-misc}/plasma-nm
File collisions:
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement-kded.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_l2tpui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_openconnectui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_openswanui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_openvpnui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_pptpui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_strongswanui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_vpncui.mo
Package-Manager: portage-2.2.20.1
kde-plasma/plasma-nm/plasma-nm-5.4.49..ebuild | 2 +-
kde-plasma/plasma-nm/plasma-nm-.ebuild| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.4.49..ebuild
b/kde-plasma/plasma-nm/plasma-nm-5.4.49..ebuild
index 77a0fd7..d26481f 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.4.49..ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.4.49..ebuild
@@ -50,7 +50,7 @@ DEPEND="
)
"
RDEPEND="${DEPEND}
- !kde-base/plasma-nm
+ !kde-misc/plasma-nm
"
src_configure() {
diff --git a/kde-plasma/plasma-nm/plasma-nm-.ebuild
b/kde-plasma/plasma-nm/plasma-nm-.ebuild
index 77a0fd7..d26481f 100644
--- a/kde-plasma/plasma-nm/plasma-nm-.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-.ebuild
@@ -50,7 +50,7 @@ DEPEND="
)
"
RDEPEND="${DEPEND}
- !kde-base/plasma-nm
+ !kde-misc/plasma-nm
"
src_configure() {
