mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 22:47:14 -08:00
Merge updates from master
This commit is contained in:
@@ -16,7 +16,7 @@ SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
|
||||
LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
|
||||
|
||||
# +alsa-plugin as discussed in bug #519530
|
||||
IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
|
||||
|
||||
@@ -213,3 +213,6 @@ dev-libs/eet test
|
||||
|
||||
# net-misc/freerdp (doesnt build)
|
||||
media-video/vlc rdp
|
||||
|
||||
# net-wireless/bluez
|
||||
media-sound/pulseaudio bluetooth
|
||||
|
||||
@@ -7,4 +7,5 @@ DIST btrfs-progs-v4.0.1.tar.xz 1104340 SHA256 2c2e10e79edd16a92effe8619c527fd130
|
||||
DIST btrfs-progs-v4.0.tar.xz 1102500 SHA256 179cf1acc1b0061548b8f1d9cf973a8338bf96f192cecad99ecdace9ae065a1f SHA512 895d6c27bd82c4b320c705c32613b28e601f316c0881080d8c376d0045162eaab6c91431dee73b391fc608e6d7c16f3a744ef6b9c85adb4beaa4376fbbe36d9a WHIRLPOOL cf71cc4ab6c85e8673143bb779c7b252caf1bfabc14fb2d7dd3477bd842b491ac3d7f121c3dcbecec023c5873c4b4400a5f2087e55bbee14217982f9712d5c2f
|
||||
DIST btrfs-progs-v4.1.2.tar.xz 1123080 SHA256 62db60c6a0868afb6302112cea54c756873bc30b826696b167ec03ecd61b2f12 SHA512 dd159bcc3adb65efd4f612d75f5a6b30df8ad9fa06ef952dd03dac965256de37eab26f4cc2fb3840178403ccbb7368cae11638e27eadb9b1835b636c4b126e2e WHIRLPOOL 819e6d61ecbb0f2d099abcda70ae9ab53b3311a28131fdedbbad7cc033c4984309a460f704d2f2ce7cf36cf0e034e82618c1b45002fdfbb5eced648883e12a29
|
||||
DIST btrfs-progs-v4.1.tar.xz 1119564 SHA256 abc6ff9dbbf948e7358edd34db32103cba8b86c5cb9e3ed7eb3b5630e2feb7e8 SHA512 0c596bab3276d1dc6de010ce94a1d7758c80fe21d540b2d4b3487e0a5cf0a63b27fdba3e1af42aa349447a0be459f2087f9b4ae03fdc0dfcc4f316e570893346 WHIRLPOOL 97ae77f578f162ec114e137899f195ec0e28097902e2f2ae5e1f37db359cd6c1bae2f0fb6641b0365df80defb844d58603623db27dc63c1576437efcaf19d3e6
|
||||
DIST btrfs-progs-v4.2.2.tar.xz 1143760 SHA256 5d87e4ebb2a3a288c167791e489bfa484034d185c704870c484cb0771d921316 SHA512 2ad23546b3bb421faad1f67da37566b6ae1887c5340c0f1d06ca59fc0cd0fb1060d92e74e36ba7bfd85b0aff30811525654cd03b7d3570b0b51c2d8e2d6d9a76 WHIRLPOOL 5051f232bf5d6c2d19bc0fba9f2653546fc09000279863637a7ab44ff5c8bd107e5307aef3d2fbc7113581df3c224965f882045153eb9fa10da5b34cc4318188
|
||||
DIST btrfs-progs-v4.2.tar.xz 1130488 SHA256 25233c3e94c52bf433e8749c17dad2acd8004c6dbc93e2bff9397c4e9fa58fbe SHA512 ba322478c1ce4df5548a953de581053c9fb9d60d1626639dc543065847a0c92ea6712728479dcb59487e02ab6aaea9f688fe1e3ef5087517e55d346b02d36065 WHIRLPOOL 54cd45554c15bedac3baac6939e6e91965b59c1c6cc0b7ca10d4c910dfe56811a278f9ee6026a9cc61286544370a45f0c0ccccfb08d7958d7a0c4b2964751bd4
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit bash-completion-r1 eutils multilib toolchain-funcs
|
||||
|
||||
libbtrfs_soname=0
|
||||
|
||||
if [[ ${PV} != 9999 ]]; then
|
||||
MY_PV=v${PV}
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
|
||||
SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
|
||||
S="${WORKDIR}"/${PN}-${MY_PV}
|
||||
else
|
||||
WANT_LIBTOOL=none
|
||||
inherit autotools git-r3
|
||||
EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git
|
||||
https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git"
|
||||
EGIT_BRANCH="devel"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Btrfs filesystem utilities"
|
||||
HOMEPAGE="https://btrfs.wiki.kernel.org"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0/${libbtrfs_soname}"
|
||||
IUSE="+convert"
|
||||
|
||||
RESTRICT=test # tries to mount repared filesystems
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/lzo:2=
|
||||
sys-libs/zlib:0=
|
||||
convert? (
|
||||
sys-fs/e2fsprogs:0=
|
||||
sys-libs/e2fsprogs-libs:0=
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
convert? ( sys-apps/acl )
|
||||
app-text/asciidoc
|
||||
app-text/docbook-xml-dtd:4.5
|
||||
app-text/xmlto
|
||||
"
|
||||
|
||||
if [[ ${PV} == 9999 ]]; then
|
||||
DEPEND+=" sys-devel/gnuconfig"
|
||||
fi
|
||||
|
||||
src_prepare() {
|
||||
epatch_user
|
||||
if [[ ${PV} == 9999 ]]; then
|
||||
eautoreconf
|
||||
mkdir config || die
|
||||
local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
|
||||
[[ -e ${automakedir} ]] || die "Could not locate automake directory"
|
||||
ln -s "${automakedir}"/install-sh config/install-sh || die
|
||||
ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
|
||||
ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myeconfargs=(
|
||||
--bindir="${EPREFIX}"/sbin
|
||||
$(use_enable convert)
|
||||
$(use_enable elibc_glibc backtrace)
|
||||
)
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
newbashcomp btrfs-completion btrfs
|
||||
}
|
||||
@@ -1,2 +1,2 @@
|
||||
DIST google-chrome-unstable_47.0.2522.1-1_amd64.deb 47590434 SHA256 57e8c77e5846b6f3a05d54645ad15afc09dc57fa7931fe1c62bd493a3684c499 SHA512 a348f1b5110c9112cc775a5ad831104f62bef82adab83ff8db389b7bfe78cee6cb4a4d97104bfc2dbf095bc91e26f1cb046d3d9d52e74dc26805a18ed591e836 WHIRLPOOL dfbf27c6932d613798fafeb6d70f0dac8cb9ba8b154ec2098096e98c1f832ba0887468ac6665d89549d71440d9803eceb3ccbb5624f9d97fdf8a1a20d629f2ee
|
||||
DIST google-chrome-unstable_47.0.2522.1-1_i386.deb 46988260 SHA256 cf40b161e61d266bcc99134b4dcbde5d49af747a7f438937a0f12ed5c9111665 SHA512 6bfa3bc74e73696caa06dc3d9deafafc09a782b16bbb4bea8a85368c7ac839bafb7d53dd68ba9cf010877ebd9ae9920347a75c8f1b12e085f1fd4b67f0531ada WHIRLPOOL 32bda47dd82cc0b426683c3a76660ea3d6a4cfd0ca781ed18f178a9e2b16947468230c47809f5ccddee552b2ab7e7ac73fd5e7b31ed97782ed3819e9fe0c2d51
|
||||
DIST google-chrome-unstable_47.0.2526.6-1_amd64.deb 47463090 SHA256 6bc6a5aec740a2a193446dec3c4726f099f47c0da3f962bb1aff7aca5d50b5e2 SHA512 6a99b1ad503733ff7840820a09555ef01fef5cd4c7ecfb06d5ccace395a38844e5c2bfb250b2630ea58311b1a481a33989319cefe4a4a1d28245d1447ab2ceed WHIRLPOOL 64a8265ee21ab69ca64b3c2da40f4ecc94d458460cb1f0a8ac744ce6a393cc7c59afa430a5a83fb2529e822fbc4920191b03494dfd781b24746f0d4b2a6262b7
|
||||
DIST google-chrome-unstable_47.0.2526.6-1_i386.deb 46783286 SHA256 bba85100aafeb50a87a853282c33788d636c58925454aef3ddfd2c62e84b8d37 SHA512 2b0238a5d15c60bca58e60776ea05f35b0056d4d83ed6eb251efca80dcaae78b1c1d8d7800fcb9692bd16717e5830c8f2451a47c3797904f4cc3ac6552cc39db WHIRLPOOL e91b5804eb76227cfe359df8e79fbbb7a6c8a45f17a39679150df6b83674576f630c2aa54a628b054c9ecd5d71a32d9c6377c8f430d652651c22516b261af61f
|
||||
|
||||
@@ -2,5 +2,5 @@ DIST google-chrome-beta_46.0.2490.52-1_amd64.deb 47188898 SHA256 c96732a2a9f6c09
|
||||
DIST google-chrome-beta_46.0.2490.52-1_i386.deb 46989238 SHA256 a5164faa32d22cf60cf9c3861760f7d7507c55a2bf94d8297acef12f58674f82 SHA512 28021f863fc16758e64675d45399719984d34f956dfbfa7ef007c635fac3b0e6ffaf87a4ecdbd6575d6f745ecaa04bfff01904100b7106592928ce630efc6636 WHIRLPOOL 27452b59301dfc10f0e7998effe89b7313e1538c7f42e1b7fca838cf800a3067caeda54607055aa11bb797ff44c5704e0a155194338ebfc591ea41b8148fc66d
|
||||
DIST google-chrome-stable_45.0.2454.101-1_amd64.deb 47425034 SHA256 f22f41e2ab4af3d0ef4b88f47abcf9fbcd9e9ec5e0a1ecb275cbb673ec688bb3 SHA512 506f846c1da31a2be5aac306d40e293ce0d36c7278e86a74700b223f7ef35bf386ce81bd989d37bec70c55f1339ec31eaf428ce36b7ea1185c3da15612791e64 WHIRLPOOL d9ca61d2a8ec2c1551c8a4358e62e060fa527e82301a23909a46b27d764ebf45afcea0bd399ca8e5a658eca77dcca96763ab676e4060a64789a643f5756e02ba
|
||||
DIST google-chrome-stable_45.0.2454.101-1_i386.deb 46992150 SHA256 a5f2275d59b9bf49f094c62ce6a60610be5826cf96edf09525679f5e67a588d2 SHA512 ec05f2418ae25803eb0130c08f804d03d1dd5d6997d269298d6cf43fb74a75a60792ddef499ed97695951c2272155db087f2eb9ab7c7196847ccf421641e9118 WHIRLPOOL 86719d3d52bb32c716eb1fb7136223357d489e81e36096f8438bf565984bbcf44c5f3bcb2ff278615cb6eece988202470b30c0505e49726bdc6ab190c8fdb186
|
||||
DIST google-chrome-unstable_47.0.2522.1-1_amd64.deb 47590434 SHA256 57e8c77e5846b6f3a05d54645ad15afc09dc57fa7931fe1c62bd493a3684c499 SHA512 a348f1b5110c9112cc775a5ad831104f62bef82adab83ff8db389b7bfe78cee6cb4a4d97104bfc2dbf095bc91e26f1cb046d3d9d52e74dc26805a18ed591e836 WHIRLPOOL dfbf27c6932d613798fafeb6d70f0dac8cb9ba8b154ec2098096e98c1f832ba0887468ac6665d89549d71440d9803eceb3ccbb5624f9d97fdf8a1a20d629f2ee
|
||||
DIST google-chrome-unstable_47.0.2522.1-1_i386.deb 46988260 SHA256 cf40b161e61d266bcc99134b4dcbde5d49af747a7f438937a0f12ed5c9111665 SHA512 6bfa3bc74e73696caa06dc3d9deafafc09a782b16bbb4bea8a85368c7ac839bafb7d53dd68ba9cf010877ebd9ae9920347a75c8f1b12e085f1fd4b67f0531ada WHIRLPOOL 32bda47dd82cc0b426683c3a76660ea3d6a4cfd0ca781ed18f178a9e2b16947468230c47809f5ccddee552b2ab7e7ac73fd5e7b31ed97782ed3819e9fe0c2d51
|
||||
DIST google-chrome-unstable_47.0.2526.6-1_amd64.deb 47463090 SHA256 6bc6a5aec740a2a193446dec3c4726f099f47c0da3f962bb1aff7aca5d50b5e2 SHA512 6a99b1ad503733ff7840820a09555ef01fef5cd4c7ecfb06d5ccace395a38844e5c2bfb250b2630ea58311b1a481a33989319cefe4a4a1d28245d1447ab2ceed WHIRLPOOL 64a8265ee21ab69ca64b3c2da40f4ecc94d458460cb1f0a8ac744ce6a393cc7c59afa430a5a83fb2529e822fbc4920191b03494dfd781b24746f0d4b2a6262b7
|
||||
DIST google-chrome-unstable_47.0.2526.6-1_i386.deb 46783286 SHA256 bba85100aafeb50a87a853282c33788d636c58925454aef3ddfd2c62e84b8d37 SHA512 2b0238a5d15c60bca58e60776ea05f35b0056d4d83ed6eb251efca80dcaae78b1c1d8d7800fcb9692bd16717e5830c8f2451a47c3797904f4cc3ac6552cc39db WHIRLPOOL e91b5804eb76227cfe359df8e79fbbb7a6c8a45f17a39679150df6b83674576f630c2aa54a628b054c9ecd5d71a32d9c6377c8f430d652651c22516b261af61f
|
||||
|
||||
Reference in New Issue
Block a user