mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 10:37:22 -08:00
Merge updates from master
This commit is contained in:
@@ -1,3 +1,3 @@
|
||||
DIST Term-ReadLine-Gnu-1.20.tar.gz 69077 SHA256 25da93084b57467cf24b85be557b07ade4af03776b8b2d5369d4d76b179edb01 SHA512 a3db13795959672b312937cb68a989d262fbf4c934d6e8924c2992457b8c1c0890a789275808bb50191cd4eb69c87b238f8423c58d62e1164eaa12c1f5941132 WHIRLPOOL ac8a405c0d6715dd19cba2dd393cc41db57f63ef84f5dc1c3e5699958ee33124d62d2fbc3de7bfdda3499447c231d0eee29ff6182b80859cfb2baeb7f1a67145
|
||||
DIST Term-ReadLine-Gnu-1.22.tar.gz 72917 SHA256 02dd4c4bf97a369b5dff8bb33e42cc9b91b2b856a40d86073e04a7fd9832de5d SHA512 36bdf094938288729f6000f3503915c6a373f194717aa40f37435e389f1205a25729684de89a567bd805eebcf1707efbebfb9bd9d761cbc902aba1c5f4609a61 WHIRLPOOL b5b451a942e4d9ad2aaf811b5004e00be6ab457e826dbb041668ca2e02830f69d0195b05e0c0794fb9994dd6a125c7a86ff6c16edaa5a71996e63cd34fef52e6
|
||||
DIST Term-ReadLine-Gnu-1.26.tar.gz 74783 SHA256 f8f075eef6056e0649cce355af2b8695ea1c793dc15d5834012c800297dc4de8 SHA512 80fe97f857b585d96b3a888d0a49d777a5b9865cc2101e43dd5916d09343d0964710c49d94b4533cce8a4a2b0770ebc4ce3c2e36fd0624b7d9ccf2318240dfed WHIRLPOOL f97532b902a6137af9f11709eb1abf606e32717ff36baf9ebab89a6121db4a38284558c3ff03b8a77c068250da7194ca5dc4ef4572e1ae442be89a30b0bb3490
|
||||
DIST Term-ReadLine-Gnu-1.27.tar.gz 76921 SHA256 05c9332ecea8880244f459b8f37a3c9b3cf76f0aaa23e97532ed152dae01e558 SHA512 e3834057a9da6bf4022b2b1614255fbc673877506ab9fd78497b0fbfa2b6df9142b4061a0a58f8281c7bde0caf7d2b700d5f2d4284dbb2af736bfaad0dfd5a22 WHIRLPOOL ba48eae0236371e5cdf18b85e20e5a5e749d21329bc3a2a0ffc2e458749e8b07ed6d894489a4b17006df52c7ecc27db9b901b2eb824367dd0e76f803298c8c2f
|
||||
|
||||
+7
-5
@@ -1,11 +1,11 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=HAYASHI
|
||||
MODULE_VERSION=${PV:0:4}
|
||||
MODULE_VERSION=1.27
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="GNU Readline XS library wrapper"
|
||||
@@ -14,9 +14,11 @@ SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=sys-libs/readline-6.2"
|
||||
RDEPEND="${DEPEND}"
|
||||
RDEPEND=">=sys-libs/readline-6.2:0="
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/perl-ExtUtils-MakeMaker
|
||||
"
|
||||
|
||||
mymake=( PASTHRU_DEFINE="-Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free" )
|
||||
PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
|
||||
|
||||
SRC_TEST="do parallel"
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -ruN Term-ReadLine-Gnu-1.27-orig/Makefile.PL Term-ReadLine-Gnu-1.27/Makefile.PL
|
||||
--- Term-ReadLine-Gnu-1.27-orig/Makefile.PL 2015-09-06 06:21:20.000000000 +0200
|
||||
+++ Term-ReadLine-Gnu-1.27/Makefile.PL 2015-09-20 20:17:06.998740899 +0200
|
||||
@@ -317,7 +317,7 @@
|
||||
system($comp_cmd);
|
||||
if ($?) {
|
||||
warn "\nsystem(): $!";
|
||||
- exit $err;
|
||||
+ # exit $err; https://rt.cpan.org/Public/Bug/Display.html?id=107201
|
||||
}
|
||||
unless (`./rlmalloc` !~ /^ok$/ || $?) {
|
||||
$extra_defs = $xdef;
|
||||
@@ -33,7 +33,10 @@ chromium_suid_sandbox_check_kernel_config() {
|
||||
ERROR_NET_NS="NET_NS is required for sandbox to work"
|
||||
ERROR_USER_NS="USER_NS is required for sandbox to work"
|
||||
ERROR_SECCOMP_FILTER="SECCOMP_FILTER is required for sandbox to work"
|
||||
CONFIG_CHECK="~PID_NS ~NET_NS ~SECCOMP_FILTER ~USER_NS"
|
||||
# Warn if the kernel does not support features needed for the browser to work
|
||||
# (bug #552576).
|
||||
ERROR_CONFIG_ADVISE_SYSCALLS="CONFIG_ADVISE_SYSCALLS is required for the renderer (bug #552576)"
|
||||
CONFIG_CHECK="~PID_NS ~NET_NS ~SECCOMP_FILTER ~USER_NS ~CONFIG_ADVISE_SYSCALLS"
|
||||
check_extra_config
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -20,6 +20,7 @@ RDEPEND="
|
||||
>=app-arch/xz-utils-4.9:=
|
||||
dev-db/sqlite:3=
|
||||
>=dev-libs/glib-2.38:2
|
||||
dev-libs/libgcrypt:0=
|
||||
>=dev-libs/libxml2-2.6.5:2
|
||||
>=dev-libs/libxslt-1.1.4
|
||||
>=gnome-extra/yelp-xsl-3.12
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
DIST libchamplain-0.12.10.tar.xz 597476 SHA256 bf53ceb2405d4e23a14596a53ecc2a821b003f8c69de4a7de3a39d6e99462b05 SHA512 e9ac75f3fb785c8c124a4ac3e0d3ea7a0c1b2115342a8f18c77cd912f7d0e3946dd9000459cb91cf7fe90c6e6459da038cee7a3726734fb8013d8beb5e778496 WHIRLPOOL 06232727d43ae8fcefaa140d7f752a564bbff8f584cd49da4599118dcd2d8179df024093f65afa879bed34242b691273be951efa28f341eaf5343b5f29c4613b
|
||||
DIST libchamplain-0.12.11.tar.xz 600264 SHA256 851e24888d967c10acb8fd878df1292a84b8180eb4c48fc5bfbf1a48896d4aa5 SHA512 d93fe3f1b0f86c627c9ccff76df4f7c701f861c99113697ea4cd682ee666782d05987c99403aa88e3ec83673bd56cc724cc3f592b41ec1da9c80ed36d2f95ad7 WHIRLPOOL 7797ea8870fffee89c1b9ffc7c1c91f36bc7655ff129cf6f830d55b02aaadb137ddad9bc305755870c6de204e2f496e09ce05f7797f58d43cfc47ec786e99ead
|
||||
DIST libchamplain-0.12.9.tar.xz 594280 SHA256 b25ce832334976c07bf9564bf7f31e628881c69cf871a256cf4530cb277917e3 SHA512 3aa67e7038667c4be3b2120baefb1526f10542af1b6727b70d9f63da6bc85fccf1e146a743c01193a045fbbda662e1da65fe5bc64ea2d776c5af793d54b32def WHIRLPOOL 33c58e34cb75260a4af6c6689b6f011bbd37204a03a508ff22517cfbf9a68d7933d1e94e5dad4ed071f9cf467cc60c9c44f3bb21fb304973872c4a03719d6ca4
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
GCONF_DEBUG=no
|
||||
VALA_USE_DEPEND=vapigen
|
||||
|
||||
inherit gnome2 vala
|
||||
|
||||
DESCRIPTION="Clutter based world map renderer"
|
||||
HOMEPAGE="https://wiki.gnome.org/Projects/libchamplain"
|
||||
|
||||
SLOT="0.12"
|
||||
LICENSE="LGPL-2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
|
||||
IUSE="debug +gtk +introspection vala"
|
||||
REQUIRED_USE="vala? ( introspection )"
|
||||
|
||||
RDEPEND="
|
||||
dev-db/sqlite:3
|
||||
dev-libs/glib:2
|
||||
>=media-libs/clutter-1.12:1.0[introspection?]
|
||||
media-libs/cogl:=
|
||||
>=net-libs/libsoup-2.34:2.4
|
||||
x11-libs/cairo
|
||||
gtk? (
|
||||
x11-libs/gtk+:3[introspection?]
|
||||
media-libs/clutter-gtk:1.0 )
|
||||
introspection? ( dev-libs/gobject-introspection:= )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-util/gtk-doc-am
|
||||
virtual/pkgconfig
|
||||
vala? ( $(vala_depend) )
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
# Fix documentation slotability
|
||||
sed \
|
||||
-e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-${SLOT}/" \
|
||||
-i docs/reference/Makefile.{am,in} || die "sed (1) failed"
|
||||
sed \
|
||||
-e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-gtk-${SLOT}/" \
|
||||
-i docs/reference-gtk/Makefile.{am,in} || die "sed (2) failed"
|
||||
mv "${S}"/docs/reference/${PN}{,-${SLOT}}-docs.sgml || die "mv (1) failed"
|
||||
mv "${S}"/docs/reference-gtk/${PN}-gtk{,-${SLOT}}-docs.sgml || die "mv (2) failed"
|
||||
|
||||
use vala && vala_src_prepare
|
||||
gnome2_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Vala demos are only built, so just disable them
|
||||
gnome2_src_configure \
|
||||
--disable-maemo \
|
||||
--disable-memphis \
|
||||
--disable-static \
|
||||
--disable-vala-demos \
|
||||
$(use_enable debug) \
|
||||
$(use_enable gtk) \
|
||||
$(use_enable introspection)
|
||||
}
|
||||
@@ -2,5 +2,5 @@ DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 SHA256 517bdadbaa0e13285b2d72a667b3112
|
||||
DIST gtk+-1.2.10.tar.gz 2868322 SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34 SHA512 6a05062520954287b0e24a95169d18c216145ee79d1fa7f54222db32c8e39e011e3dc49886d3bc4de1cc1ebd71f5744e41891cde8d5c2759f637e71c390a235f WHIRLPOOL 906a78c2e2664b1cbd70fb9e64ce6ca1155b2a59c169eab986f5b4b90e937f380a5d35e2e28eb56913b0fbdfb53abeca5ef6823f92a3ab3906cd4e9f7c595b15
|
||||
DIST gtk+-2.24.28.tar.xz 13354884 SHA256 b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656 SHA512 86d563645ca70c1e14afd4b38d925f496e596cbf6181f2e95310f58c2f4152aaecc559e3c513e6d405fcf48d8d413d59a9d72782216529c1280bd8e1947d7760 WHIRLPOOL b4943bb7792f962e0fc50a118f0dbce58a79678e1a98632717a2f3bda4ddd99b62ce9aed3b14f1c0912a4b53eb975991527843985f625c5a9e052db4889acfb0
|
||||
DIST gtk+-3.14.13.tar.xz 15784112 SHA256 b1efcb1ef299f9b205e6f4512428315fd03484e5790f65bd3ac164e84ade90b0 SHA512 e4fcca57fe58821832ee0b542d86033a1028c19e2248929e25a8c16ef05603a93815556591bcc025995bfab1238ad4060fcdf4920ec2df22ab3175b404f3a207 WHIRLPOOL 36a77983701da6041f0762013638303d323a42487a6f6508e92dfa0571f8f13b8598a8187e9665e6eeb62e41b7c2533a1fe9d2b68f097e85599d373969d52da0
|
||||
DIST gtk+-3.16.5.tar.xz 18263356 SHA256 b87c99d127eb962fc857c246b77a65322cdffd7dcbcf46a83bce2040e0f4bc31 SHA512 f8dd318d5d72e8c59534bf49e505de3575f7519d57398030f4c47a576c3b37e4f00fec1b5a3ba2a3769e94373504dfb6ca24b1015f1e8f8f7dca6f46114b95f8 WHIRLPOOL 9c7ca6a76bde91912043ccfb26375327628fb2206b0e613116c9b6b1f1d078cccf075690b7749d76e8ddea3e3118ecae79e49be98490db29a7a2042f843d0b97
|
||||
DIST gtk+-3.16.6.tar.xz 18273872 SHA256 4d12726d0856a968b41802ae5c5971d7e9bac532717e309d3f81b9989da5ffbe SHA512 0b3417c57ef755c8eb498b6800cd9e1dc1df01d508425c968944aaa0d7ff50f25a00370f9a6ccf23a87cc9f7fb251447e63055149264b997ee5a681e98dc54ec WHIRLPOOL f944cce4396d2519d357ef75f1e9d420b64d77004110f0e7d2eb643ae5b3f8182db5be28e35269a57ecfe9cbc3280dc65008c30ce1c977d64d0fbb317e6f6bce
|
||||
DIST gtk+-3.16.7.tar.xz 18294656 SHA256 19689d14de54d182fad538153dbff6d41f53841f940aa871585fdea0306c7fba SHA512 8f74b3a4093ecf776466d3988806fdae081d10d5e74c66770b52f624076afe92d58efb68ace47fd0dbc5a170a577fc9a8d1b4768794aa4249433c95198db00c8 WHIRLPOOL f8b4d9fa6b7b3ed9702f76d28d729b745217e072898239517d320f0635e87691ca874a136607566cf53d73aead53833c5ecf484fc7aea74f3c26a1f14cc5a9b4
|
||||
|
||||
Reference in New Issue
Block a user