From 41dff9eb53e9e13cd6247ea33645093eb07ee2f6 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Mon, 2 Sep 2013 21:21:32 +0200 Subject: [PATCH 1/4] media-fonts/Humor-Sans: Simplify src_unpack Package-Manager: portage-2.2.20.1 --- media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild b/media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild index 371f4b9d58480..6f6cfcbf875ac 100644 --- a/media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild +++ b/media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -20,5 +20,5 @@ FONT_S="${S}" FONT_SUFFIX="ttf" src_unpack() { - cp "${DISTDIR}/${A}" "${S}/${A//-${PV}}" + cp "${DISTDIR}/${A}" "${FONT_S}/${PN}.${FONT_SUFFIX}" } From 3cd92287be0d44165fce9e8873701a3d11dd8b3b Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Sat, 10 Oct 2015 13:20:41 +0100 Subject: [PATCH 2/4] media-fonts/Humor-Sans: Keyword ~x86 Package-Manager: portage-2.2.20.1 --- media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild b/media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild index 6f6cfcbf875ac..24cd31bbeb16d 100644 --- a/media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild +++ b/media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.antiyawn.com/uploads/${P}.ttf" LICENSE="OFL-1.1" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" S="${WORKDIR}" From 7e860831614130b9491ed52a6820278562be9672 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sat, 10 Oct 2015 14:28:44 +0200 Subject: [PATCH 3/4] profiles/prefix/darwin/macos: add 10.11 (Mac OS X El Capitan) profiles --- profiles/prefix/darwin/macos/10.11/eapi | 1 + .../prefix/darwin/macos/10.11/make.defaults | 9 +++ .../prefix/darwin/macos/10.11/package.mask | 8 +++ .../darwin/macos/10.11/package.provided | 5 ++ .../prefix/darwin/macos/10.11/package.unmask | 8 +++ .../darwin/macos/10.11/package.use.mask | 8 +++ profiles/prefix/darwin/macos/10.11/parent | 1 + .../prefix/darwin/macos/10.11/profile.bashrc | 5 ++ profiles/prefix/darwin/macos/10.11/x64/eapi | 1 + .../darwin/macos/10.11/x64/make.defaults | 13 ++++ .../darwin/macos/10.11/x64/package.mask | 3 + .../darwin/macos/10.11/x64/package.use.force | 7 +++ .../darwin/macos/10.11/x64/package.use.mask | 5 ++ profiles/prefix/darwin/macos/10.11/x64/parent | 2 + .../prefix/darwin/macos/10.11/x64/use.mask | 59 +++++++++++++++++++ profiles/prefix/darwin/macos/10.11/x86/eapi | 1 + .../darwin/macos/10.11/x86/make.defaults | 13 ++++ .../darwin/macos/10.11/x86/package.mask | 10 ++++ .../darwin/macos/10.11/x86/package.use.force | 7 +++ .../darwin/macos/10.11/x86/package.use.mask | 5 ++ profiles/prefix/darwin/macos/10.11/x86/parent | 2 + .../prefix/darwin/macos/10.11/x86/use.mask | 59 +++++++++++++++++++ 22 files changed, 232 insertions(+) create mode 100644 profiles/prefix/darwin/macos/10.11/eapi create mode 100644 profiles/prefix/darwin/macos/10.11/make.defaults create mode 100644 profiles/prefix/darwin/macos/10.11/package.mask create mode 100644 profiles/prefix/darwin/macos/10.11/package.provided create mode 100644 profiles/prefix/darwin/macos/10.11/package.unmask create mode 100644 profiles/prefix/darwin/macos/10.11/package.use.mask create mode 100644 profiles/prefix/darwin/macos/10.11/parent create mode 100644 profiles/prefix/darwin/macos/10.11/profile.bashrc create mode 100644 profiles/prefix/darwin/macos/10.11/x64/eapi create mode 100644 profiles/prefix/darwin/macos/10.11/x64/make.defaults create mode 100644 profiles/prefix/darwin/macos/10.11/x64/package.mask create mode 100644 profiles/prefix/darwin/macos/10.11/x64/package.use.force create mode 100644 profiles/prefix/darwin/macos/10.11/x64/package.use.mask create mode 100644 profiles/prefix/darwin/macos/10.11/x64/parent create mode 100644 profiles/prefix/darwin/macos/10.11/x64/use.mask create mode 100644 profiles/prefix/darwin/macos/10.11/x86/eapi create mode 100644 profiles/prefix/darwin/macos/10.11/x86/make.defaults create mode 100644 profiles/prefix/darwin/macos/10.11/x86/package.mask create mode 100644 profiles/prefix/darwin/macos/10.11/x86/package.use.force create mode 100644 profiles/prefix/darwin/macos/10.11/x86/package.use.mask create mode 100644 profiles/prefix/darwin/macos/10.11/x86/parent create mode 100644 profiles/prefix/darwin/macos/10.11/x86/use.mask diff --git a/profiles/prefix/darwin/macos/10.11/eapi b/profiles/prefix/darwin/macos/10.11/eapi new file mode 100644 index 0000000000000..7ed6ff82de6bc --- /dev/null +++ b/profiles/prefix/darwin/macos/10.11/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/prefix/darwin/macos/10.11/make.defaults b/profiles/prefix/darwin/macos/10.11/make.defaults new file mode 100644 index 0000000000000..033c3077b2803 --- /dev/null +++ b/profiles/prefix/darwin/macos/10.11/make.defaults @@ -0,0 +1,9 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +MACOSX_DEPLOYMENT_TARGET="10.11" + +# sandbox is working with use of Mac OS X's seatbelt (since 10.5) +# but it generates problems, #456234 +#FEATURES="sandbox" diff --git a/profiles/prefix/darwin/macos/10.11/package.mask b/profiles/prefix/darwin/macos/10.11/package.mask new file mode 100644 index 0000000000000..1164f69c27e6b --- /dev/null +++ b/profiles/prefix/darwin/macos/10.11/package.mask @@ -0,0 +1,8 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# Fabian Groffen (30 Sep 2012) +# Requires XQuartz, since Apple dropped much of X-support in 10.8 +# (a.k.a. Mountain Lion), bug #431182 +<=media-libs/opengl-apple-4.9999 diff --git a/profiles/prefix/darwin/macos/10.11/package.provided b/profiles/prefix/darwin/macos/10.11/package.provided new file mode 100644 index 0000000000000..a27ff1e8b050b --- /dev/null +++ b/profiles/prefix/darwin/macos/10.11/package.provided @@ -0,0 +1,5 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +sys-darwin/libsystem-71 diff --git a/profiles/prefix/darwin/macos/10.11/package.unmask b/profiles/prefix/darwin/macos/10.11/package.unmask new file mode 100644 index 0000000000000..b20523d4160c7 --- /dev/null +++ b/profiles/prefix/darwin/macos/10.11/package.unmask @@ -0,0 +1,8 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# James Le Cuirot (29 Jul 2015) +# Recent releases are supported in >10.10. +dev-java/oracle-jdk-bin +dev-java/oracle-jre-bin diff --git a/profiles/prefix/darwin/macos/10.11/package.use.mask b/profiles/prefix/darwin/macos/10.11/package.use.mask new file mode 100644 index 0000000000000..24f749c3e127a --- /dev/null +++ b/profiles/prefix/darwin/macos/10.11/package.use.mask @@ -0,0 +1,8 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# Fabian Groffen (10 Apr 2011) +# as long as util-linux installs uuid.h which breaks the system headers +# (hence we don't) we can't do uuid support here +x11-libs/libSM -uuid diff --git a/profiles/prefix/darwin/macos/10.11/parent b/profiles/prefix/darwin/macos/10.11/parent new file mode 100644 index 0000000000000..f3229c5b98768 --- /dev/null +++ b/profiles/prefix/darwin/macos/10.11/parent @@ -0,0 +1 @@ +.. diff --git a/profiles/prefix/darwin/macos/10.11/profile.bashrc b/profiles/prefix/darwin/macos/10.11/profile.bashrc new file mode 100644 index 0000000000000..012e1228bf8f8 --- /dev/null +++ b/profiles/prefix/darwin/macos/10.11/profile.bashrc @@ -0,0 +1,5 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +export MACOSX_DEPLOYMENT_TARGET=10.11 diff --git a/profiles/prefix/darwin/macos/10.11/x64/eapi b/profiles/prefix/darwin/macos/10.11/x64/eapi new file mode 100644 index 0000000000000..7ed6ff82de6bc --- /dev/null +++ b/profiles/prefix/darwin/macos/10.11/x64/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/prefix/darwin/macos/10.11/x64/make.defaults b/profiles/prefix/darwin/macos/10.11/x64/make.defaults new file mode 100644 index 0000000000000..bc129813548d3 --- /dev/null +++ b/profiles/prefix/darwin/macos/10.11/x64/make.defaults @@ -0,0 +1,13 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +ARCH="x64-macos" +CHOST="x86_64-apple-darwin15" +ACCEPT_KEYWORDS="~x64-macos" + +USE="mmx mmxext sse sse2" +CPU_FLAGS_X86="mmx mmxext sse sse2" +# set arch to nocona for all MacTel users, as this enables SSE and MMX +# support in GCC, nocona = Core2Duo = 64-bits +CFLAGS="-march=nocona" diff --git a/profiles/prefix/darwin/macos/10.11/x64/package.mask b/profiles/prefix/darwin/macos/10.11/x64/package.mask new file mode 100644 index 0000000000000..445a68b5ea0fc --- /dev/null +++ b/profiles/prefix/darwin/macos/10.11/x64/package.mask @@ -0,0 +1,3 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ diff --git a/profiles/prefix/darwin/macos/10.11/x64/package.use.force b/profiles/prefix/darwin/macos/10.11/x64/package.use.force new file mode 100644 index 0000000000000..05bc3b7690c87 --- /dev/null +++ b/profiles/prefix/darwin/macos/10.11/x64/package.use.force @@ -0,0 +1,7 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# Elias Pipping (30 Sep 2007) +# compiles with -aqua, doesn't work, though +media-video/mplayer aqua diff --git a/profiles/prefix/darwin/macos/10.11/x64/package.use.mask b/profiles/prefix/darwin/macos/10.11/x64/package.use.mask new file mode 100644 index 0000000000000..4bccb5fc89dac --- /dev/null +++ b/profiles/prefix/darwin/macos/10.11/x64/package.use.mask @@ -0,0 +1,5 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + + diff --git a/profiles/prefix/darwin/macos/10.11/x64/parent b/profiles/prefix/darwin/macos/10.11/x64/parent new file mode 100644 index 0000000000000..fc24616eeda44 --- /dev/null +++ b/profiles/prefix/darwin/macos/10.11/x64/parent @@ -0,0 +1,2 @@ +../../arch/x64 +.. diff --git a/profiles/prefix/darwin/macos/10.11/x64/use.mask b/profiles/prefix/darwin/macos/10.11/x64/use.mask new file mode 100644 index 0000000000000..f1549ec0ec6ea --- /dev/null +++ b/profiles/prefix/darwin/macos/10.11/x64/use.mask @@ -0,0 +1,59 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# This file masks out USE flags that are simply NOT allowed in the default +# x86 profile. This works, for example, if another architecture's +# profile have a USE flag associated with (such as altivec, mmx, etc). + +# Unmask x86 instruction sets +-icc +-icc-pgo +-ifc +-mmx +-mmxext +-sse +-sse2 +-ssse3 +-cpu_flags_x86_mmx +-cpu_flags_x86_mmxext +-cpu_flags_x86_sse +-cpu_flags_x86_sse2 +-cpu_flags_x86_ssse3 +-svga +-kqemu + +# Unmask nvidia XvMC support +-nvidia + +# Unmask dev-db/oracle-instantclient-basic support +-oci8-instant-client + +# Unmask osp, used by asterisk; bug 115798 +-osp + +# Modular X: unmask for architectures on which they are available +-input_devices_synaptics +-input_devices_vmmouse +-input_devices_wacom +-video_cards_nvidia +-video_cards_fglrx +-video_cards_vmware + +# Modular X: mask for architectures on which they aren't available +video_cards_newport + +#codec support +-x264 + +# lvm2 cluster +-gulm + +# ibm is only used for ppc64 stuff +ibm + +# psyco works on x86 +-psyco + +# Adobe FDF toolkit is x86 only. +-fdftk diff --git a/profiles/prefix/darwin/macos/10.11/x86/eapi b/profiles/prefix/darwin/macos/10.11/x86/eapi new file mode 100644 index 0000000000000..7ed6ff82de6bc --- /dev/null +++ b/profiles/prefix/darwin/macos/10.11/x86/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/prefix/darwin/macos/10.11/x86/make.defaults b/profiles/prefix/darwin/macos/10.11/x86/make.defaults new file mode 100644 index 0000000000000..918b7eb997085 --- /dev/null +++ b/profiles/prefix/darwin/macos/10.11/x86/make.defaults @@ -0,0 +1,13 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +ARCH="x86-macos" +CHOST="i686-apple-darwin15" +ACCEPT_KEYWORDS="~x86-macos" + +USE="mmx mmxext sse sse2" +CPU_FLAGS_X86="mmx mmxext sse sse2" +# normally we set arch to prescott for all MacTel users, as this enables +# SSE and MMX support in GCC +CFLAGS="-march=prescott" diff --git a/profiles/prefix/darwin/macos/10.11/x86/package.mask b/profiles/prefix/darwin/macos/10.11/x86/package.mask new file mode 100644 index 0000000000000..d1b293c01fd82 --- /dev/null +++ b/profiles/prefix/darwin/macos/10.11/x86/package.mask @@ -0,0 +1,10 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# The Carbon interface has been removed entirely in Lion, only tk-8.6 +# will come with Cocoa support. If you must have tk, you'll have to +# force USE=-aqua, but don't report bugs for incompatabilities you might +# encounter. +# NOTE: keep this mask synced with arch/x64 + (30 Sep 2007) +# compiles with -aqua, doesn't work, though +media-video/mplayer aqua diff --git a/profiles/prefix/darwin/macos/10.11/x86/package.use.mask b/profiles/prefix/darwin/macos/10.11/x86/package.use.mask new file mode 100644 index 0000000000000..4bccb5fc89dac --- /dev/null +++ b/profiles/prefix/darwin/macos/10.11/x86/package.use.mask @@ -0,0 +1,5 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + + diff --git a/profiles/prefix/darwin/macos/10.11/x86/parent b/profiles/prefix/darwin/macos/10.11/x86/parent new file mode 100644 index 0000000000000..4a6aa36b18d90 --- /dev/null +++ b/profiles/prefix/darwin/macos/10.11/x86/parent @@ -0,0 +1,2 @@ +../../arch/x86 +.. diff --git a/profiles/prefix/darwin/macos/10.11/x86/use.mask b/profiles/prefix/darwin/macos/10.11/x86/use.mask new file mode 100644 index 0000000000000..f1549ec0ec6ea --- /dev/null +++ b/profiles/prefix/darwin/macos/10.11/x86/use.mask @@ -0,0 +1,59 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# This file masks out USE flags that are simply NOT allowed in the default +# x86 profile. This works, for example, if another architecture's +# profile have a USE flag associated with (such as altivec, mmx, etc). + +# Unmask x86 instruction sets +-icc +-icc-pgo +-ifc +-mmx +-mmxext +-sse +-sse2 +-ssse3 +-cpu_flags_x86_mmx +-cpu_flags_x86_mmxext +-cpu_flags_x86_sse +-cpu_flags_x86_sse2 +-cpu_flags_x86_ssse3 +-svga +-kqemu + +# Unmask nvidia XvMC support +-nvidia + +# Unmask dev-db/oracle-instantclient-basic support +-oci8-instant-client + +# Unmask osp, used by asterisk; bug 115798 +-osp + +# Modular X: unmask for architectures on which they are available +-input_devices_synaptics +-input_devices_vmmouse +-input_devices_wacom +-video_cards_nvidia +-video_cards_fglrx +-video_cards_vmware + +# Modular X: mask for architectures on which they aren't available +video_cards_newport + +#codec support +-x264 + +# lvm2 cluster +-gulm + +# ibm is only used for ppc64 stuff +ibm + +# psyco works on x86 +-psyco + +# Adobe FDF toolkit is x86 only. +-fdftk From 217364bef0254769a8fcaeffb3e6d6e4da5c0e72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Sat, 10 Oct 2015 14:48:48 +0200 Subject: [PATCH 4/4] app-crypt/sign: Remove myself from metadata Package-Manager: portage-2.2.23 --- app-crypt/sign/metadata.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app-crypt/sign/metadata.xml b/app-crypt/sign/metadata.xml index 22b9e39501a44..d27c6c5ab2eeb 100644 --- a/app-crypt/sign/metadata.xml +++ b/app-crypt/sign/metadata.xml @@ -6,11 +6,6 @@ Alice Ferrazzi Assign bugs to me. - - mrueg@gentoo.org - Manuel RĂ¼ger - CC him on bugs. - sign is a file signing and signature verification utility. It's main purpose is to be a simple and convenient extension to a tar/gz/bzip2 line of tools to check