updates

merged:

  xor: b1aaa55d092c05d2339b4e052da6d4a275823f4f
  cinnamon: 7a5b421c22e62e1cc50caab698a27179e4dc1722
  mate-desktop: fb23c1ccd28a5d226294d67e40708db767ed93b8
  fusion809: 1a2f9e0f51e8f4a26bf99b247fcc50b3c28162f6
  steam: 9994d8f965b965da3d71598e4357f3cf95e451eb
  go-overlay: 435b13dcc2cdc2dc5b5fee57005d8deb2caa114c
  stefantalpalaru: f40fc3543d32fbaea07bc96cab74ae751c095d3a
  ports: 07e563c0ea01f8ccf0f729bf5a9d16495f9e3067
  gentoo-libressl: eea877be8b5f120e5ca67b3d0bf34acd908ae960
  gentoo-staging: 4f8f6306dd2aa173f3ff956fc502ba6913fe7217
  calculatelinux: 75f392a27af20d3644f1de1f3525552968a4adbf
  kit-fixups: 05c96e4c11f7ca062106c4757b8640ee119400af
parent 4f8d1d50
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit acct-group
DESCRIPTION="grafana program group"
ACCT_GROUP_ID=389
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>[email protected]</email>
</maintainer>
<origin>gentoo-staging</origin>
</pkgmetadata>
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit acct-user
DESCRIPTION="grafana program user"
ACCT_USER_ID=389
ACCT_USER_GROUPS=( ${PN} )
acct-user_add_deps
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>[email protected]</email>
</maintainer>
<origin>gentoo-staging</origin>
</pkgmetadata>
......@@ -17,7 +17,7 @@ SRC_URI="https://brltty.app/archive/${P}.tar.xz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86"
IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
java louis +midi ncurses nls ocaml +pcm policykit python
usb systemd +speech tcl xml X"
......
......@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]];then
EGIT_REPO_URI="https://git.launchpad.net/cloud-init"
else
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
KEYWORDS="amd64 x86"
KEYWORDS="amd64 ~arm64 x86"
fi
DESCRIPTION="Cloud instance initialisation magic"
......
......@@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then
SRC_URI=""
else
SRC_URI="https://download.qemu.org/${P}.tar.xz"
KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
KEYWORDS="amd64 arm64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
......
......@@ -9,7 +9,7 @@ SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
DEPEND=""
......
......@@ -12,7 +12,7 @@ SRC_URI="https://www.spice-space.org/download/releases/spice-server/${P}.tar.bz2
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ~arm64 ~ppc64 x86"
KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE="libressl lz4 sasl smartcard static-libs gstreamer"
# the libspice-server only uses the headers of libcacard
......
DIST dateutils-0.4.6.tar.xz 640552 BLAKE2B 7f1b5bef1465063f46a7bc4b64ed1d645b3bf827aa17b7c962bf3e2731a031f8cf074970aad618157283f0303222413c7be80a72bdcc65bd0918120216542295 SHA512 014e8411774250d2862943bbbdd69cc7ec2ca934349272ae7c44b136a57ef30c23f841018cc38f86d49e2348b2199848076db224e3653d6d7337a3f17709c8cb
DIST dateutils-0.4.7.tar.xz 649932 BLAKE2B 710c22d63fe3c8f77c69c97c405d3d4aa5c51de3d5768076ca24f8b2be0d6033ae652825e528d99c36f382e25c4e0a60eaa7cb9eec58f6b814d60d513b37ce7e SHA512 480943c32585efd8f42958d6e7d3304a37568f2134c9561d6e0b38f4719fd149ec7e55c559a5e73e97e1c9d217f3d53fe76a7e6a9d3114c040915ebf48db4666
......@@ -4,26 +4,35 @@
EAPI=7
DESCRIPTION="command line date and time utilities"
HOMEPAGE="https://www.fresse.org/dateutils/"
SRC_URI="https://bitbucket.org/hroptatyr/${PN}/downloads/${P}.tar.xz"
HOMEPAGE="https://www.fresse.org/dateutils/ https://github.com/hroptatyr/dateutils"
case "${PV}" in
9999)
inherit autotools git-r3
EGIT_REPO_URI="https://github.com/hroptatyr/dateutils.git"
;;
*)
SRC_URI="https://github.com/hroptatyr/dateutils/releases/download/v${PV}/${P}.tar.xz"
KEYWORDS="~amd64 ~x86"
esac
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="app-arch/xz-utils
sys-libs/timezone-data"
BDEPEND="app-arch/xz-utils"
DEPEND="sys-libs/timezone-data"
# bug 429810
RDEPEND="!sys-fabric/dapl"
RDEPEND="${DEPEND}
!sys-fabric/dapl"
PATCHES=( "${FILESDIR}"/${P}-unportable-sys-sysctl_h.patch )
src_compile() {
emake CFLAGS="${CFLAGS}"
src_prepare() {
default
[[ "${PV}" = 9999 ]] && eautoreconf
}
src_test() {
# parallel tests failure
emake CFLAGS="${CFLAGS}" -j1 check
src_configure() {
econf CFLAGS="${CFLAGS}"
}
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="command line date and time utilities"
HOMEPAGE="https://www.fresse.org/dateutils/ https://github.com/hroptatyr/dateutils"
case "${PV}" in
9999)
inherit autotools git-r3
EGIT_REPO_URI="https://github.com/hroptatyr/dateutils.git"
;;
*)
SRC_URI="https://github.com/hroptatyr/dateutils/releases/download/v${PV}/${P}.tar.xz"
KEYWORDS="~amd64 ~x86"
esac
LICENSE="BSD"
SLOT="0"
BDEPEND="app-arch/xz-utils"
DEPEND="sys-libs/timezone-data"
# bug 429810
RDEPEND="${DEPEND}
!sys-fabric/dapl"
PATCHES=(
"${FILESDIR}/${PN}-0.4.6-unportable-sys-sysctl_h.patch"
)
src_prepare() {
default
[[ "${PV}" = 9999 ]] && eautoreconf
}
src_configure() {
econf CFLAGS="${CFLAGS}"
}
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="command line date and time utilities"
HOMEPAGE="https://www.fresse.org/dateutils/ https://github.com/hroptatyr/dateutils"
case "${PV}" in
9999)
inherit autotools git-r3
EGIT_REPO_URI="https://github.com/hroptatyr/dateutils.git"
;;
*)
SRC_URI="https://github.com/hroptatyr/dateutils/releases/download/v${PV}/${P}.tar.xz"
KEYWORDS="~amd64 ~x86"
esac
LICENSE="BSD"
SLOT="0"
BDEPEND="app-arch/xz-utils"
DEPEND="sys-libs/timezone-data"
# bug 429810
RDEPEND="${DEPEND}
!sys-fabric/dapl"
src_prepare() {
default
[[ "${PV}" = 9999 ]] && eautoreconf
}
src_configure() {
econf CFLAGS="${CFLAGS}"
}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person">
<email>[email protected]</email>
<name>Matthias Coppens</name>
</maintainer>
<maintainer type="project">
<email>[email protected]</email>
<name>Proxy Maintainers</name>
</maintainer>
<upstream>
<remote-id type="bitbucket">hroptatyr/dateutils</remote-id>
</upstream>
......
......@@ -17,8 +17,9 @@ SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-8.0.2:=
"
RDEPEND=">=dev-lang/ghc-8.0.2:="
# The package is a wrapper around 'git'
RDEPEND+=" dev-vcs/git"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.24.2.0
test? ( dev-haskell/hspec
......
......@@ -2,3 +2,4 @@ DIST pango-0.12.5.3.tar.gz 60968 BLAKE2B 93abd241ed7809b3ece5862e667c80153169011
DIST pango-0.13.1.1.tar.gz 61730 BLAKE2B 185e53cb9b5355a1eb4ffe39e56eb043ab2ce09bd902a7af85f4c8d5925f8640c5aa64f74fe3d630fa155745eed5eb73e409889bde953ed9ed850cfd4724e5ff SHA512 4dd021e03e18bea64b51ad1b4c5cae2cd214f0f26bd41deecf83626f25d70670e2472877e60ff49c30cd0f3e993d8cb4ba7adc3fee26454f8713e2a5bc7a9284
DIST pango-0.13.3.1.tar.gz 52564 BLAKE2B 1c562635e9c0586363e5f3b234ae7303bf6f624a9e368afabdd3ee83477c9f4a831e072c336347af10c6b6442edac19714e4839b0f5b8a8d142b7309718e9e52 SHA512 7bcdd64abaf768bcbfc08f2fad93bc8ac142aa30b17ac0ee67ceec1429368f5a1c7cda6ed14d78278b69c948cdd4cd01630febfe41d9078c7f54d72c59d7b9b6
DIST pango-0.13.6.1.tar.gz 52637 BLAKE2B 1e7febf9c60271404e49b91f06ebfcea06657b70410f4ff87fbe69427dbb9aae991ccf0980c216a933b06c3bafddab32c176f885905099415db6a09afe7426cc SHA512 44cb7af9b04dec8d6ab8256bc39f9777238d3cb22b90576f3a77c14cf0ce23ecd0926733a6ddaa96a62da13ac88f8637d4ffa82ae875b4276d7712f3a3d81a19
DIST pango-0.13.8.1.tar.gz 52671 BLAKE2B b3e4067adc4fb2963c054e82f37864c1e57be57bb76b5d6f139cbb7ea41625a9edae12888e847194955f164f1d35bbd4555a389c3eec61da5822d046bee2ba16 SHA512 b17938143332976d048793db5c43647b2a7278713821166c1f13aa74f3c8a77e7c990481add77090418d260dd4b80df7b1eb9b0fdcc415df47b64198e3c1f5fb
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
# ebuild generated by hackport 0.6.4.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
DESCRIPTION="Binding to the Pango text rendering engine"
HOMEPAGE="https://projects.haskell.org/gtk2hs/"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
dev-haskell/mtl:=[profile?]
>=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
>=dev-lang/ghc-7.4.1:=
x11-libs/cairo
x11-libs/pango
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3
>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
virtual/pkgconfig
"
src_prepare() {
default
# https://bugs.gentoo.org/702986
if has_version "<dev-haskell/cabal-3.0.0.0"; then
eapply "${FILESDIR}"/${PN}-0.13.6.1-cabal-1.24.patch
fi
}
DIST wxc-0.92.2.0.tar.gz 203065 BLAKE2B 3f873b3bbc50e5fa7690f2f05a25ab360260d90523dd0b9c016f5dfeea99e9a59fe4848de520d642d2cea52dbadfd69aa31671f521243240488d643d4554e880 SHA512 e6fba1be94978603965b8902fad9326772b5483d5df621d5245f1fae97d85bcb1aff4565f1e8396de23c854050151c5e009e34a1ea29c3037057599ac0412bcd
DIST wxc-0.92.3.0.tar.gz 203597 BLAKE2B e73745fe17747c1abb79cdb2e7ecadee1f286abd34d1ccfbc2bb53d729fbab4dc60ab054af07f75cae9aa67e83ae794ea23f3f00decd39f69b93a5a56726d9d2 SHA512 60f34e316a4dfa4951e18d99d24508d36806f8a9d0bf05485904b03622ebda138b7a93a7477a2a107007d40e8cadbe51200322507054f65bd0b720545b414b37
--- a/Setup.hs
+++ b/Setup.hs
@@ -22,2 +22,3 @@ import Distribution.Simple.Setup ( BuildFlags, ConfigFlags
import Distribution.Simple.Utils (installOrdinaryFile, rawSystemExitWithEnv, rawSystemStdInOut, die)
+import qualified Distribution.Simple.Utils as DSU
import Distribution.System (OS (..), Arch (..), buildOS, buildArch)
@@ -81,3 +82,9 @@ rawShellSystemStdInOut :: Verbosity -- Verbosity level
-> IO (String, String, ExitCode) -- (Command result, Errors, Command exit status)
+#if MIN_VERSION_Cabal(2,2,0)
+rawShellSystemStdInOut v f as = do
+ (~(DSU.IODataText so), se, c) <- rawSystemStdInOut v "sh" (f:as) Nothing Nothing Nothing DSU.IODataModeText
+ return (so, se, c)
+#else
rawShellSystemStdInOut v f as = rawSystemStdInOut v "sh" (f:as) Nothing Nothing Nothing False
+#endif
@@ -438,3 +445,7 @@ deMsysPaths bi = do
let cor ph = do
+#if MIN_VERSION_Cabal(2,2,0)
+ (~(DSU.IODataText r), e, c) <- rawSystemStdInOut normal "sh" ["-c", "cd " ++ ph ++ "; pwd -W"] Nothing Nothing Nothing DSU.IODataModeText
+#else
(r, e, c ) <- rawSystemStdInOut normal "sh" ["-c", "cd " ++ ph ++ "; pwd -W"] Nothing Nothing Nothing False
+#endif
unless (c == ExitSuccess) (putStrLn ("Error: failed to convert MSYS path to native path \n" ++ e) >> exitFailure)
@@ -504,3 +515,7 @@ sharedLibName ver basename =
where
+#if MIN_VERSION_Cabal(2,2,0)
+ full_ver = (concat . intersperse "." . map show . versionNumbers) ver
+#else
full_ver = (concat . intersperse "." . map show . versionBranch) ver
+#endif
--- a/Setup.hs
+++ b/Setup.hs
@@ -19,7 +19,8 @@ import Distribution.Simple.Setup ( BuildFlags, ConfigFlags
, InstallFlags, installVerbosity
, fromFlag, fromFlagOrDefault, copyDest
)
-import Distribution.Simple.Utils (installOrdinaryFile, rawSystemExitWithEnv, rawSystemStdInOut, die)
+import Distribution.Simple.Utils (installOrdinaryFile, rawSystemExitWithEnv, rawSystemStdInOut)
+import System.Exit (die)
import qualified Distribution.Simple.Utils as DSU
import Distribution.System (OS (..), Arch (..), buildOS, buildArch)
import Distribution.Verbosity (Verbosity, normal, verbose)
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
# ebuild generated by hackport 0.5.3.9999
WX_GTK_VER="3.0"
CABAL_FEATURES="lib profile" # ho docs as it has no haskell files
inherit haskell-cabal multilib versionator wxwidgets
DESCRIPTION="wxHaskell C++ wrapper"
HOMEPAGE="https://wiki.haskell.org/WxHaskell"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="wxWinLL-3.1"
SLOT="${WX_GTK_VER}/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE="gstreamer"
RDEPEND=">dev-haskell/split-0:=[profile?]
>=dev-haskell/wxdirect-0.90.1.1:${WX_GTK_VER}=[profile?]
x11-libs/wxGTK:${WX_GTK_VER}=[X,gstreamer?,opengl]
>=dev-lang/ghc-7.6.1:=
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.23
"
PATCHES=(
"${FILESDIR}"/${PN}-0.92.3.0-cabal-2.2.patch
"${FILESDIR}"/${PN}-0.92.3.0-cabal-3.patch
)
src_prepare() {
default
setup-wxwidgets
sed -e "[email protected]\"wx-config\"@\"${WX_CONFIG}\"@g" \
-i "${S}/Setup.hs" || die "Could not specify wx-config in Setup.hs"
}
src_configure() {
local cgcc=()
for i in ${CXXFLAGS}
do
cgcc+=( --gcc-option="${i}" )
done
# Trying to specify the LDFLAGS in --ld-option does not work, as ld does
# not understand ld options prefixed with -Wl,
# The linker that is used to link the libwxc.so shared library is hard coded
# in Setup.hs. So the --with-ld would not change the linker used when
# linking libwxc.so. --with-ld="gcc" does not help, as then cabal passes
# ld options like -x to gcc which then returns a non-zero exit status, then
# cabal ignores all the --ld-option parameters.
# So I place all the LDFLAGS in --gcc-option parameters. They are ignored
# when building .o files.
local cld=()
for i in ${LDFLAGS}
do
cld+=( --gcc-option="${i}" )
done
cabal_src_configure ${cgcc[*]} ${cld[*]} --verbose=3
}
DIST elixir-1.10.3.tar.gz 2329031 BLAKE2B 0e8d84c71f4bb260aef875370acb89b6a8daf5187aec5fe28d13054b6a16e91925aec46a312a31e607b469657a0f4cb34d29735e9633ddc7cd69417402f1b8b1 SHA512 66b18b983e5374afbd4d94c43a880c5e46a9aa150fa6f38be74ff7f58a19eaaee00248b202d9ae3f6b78e2495fc8d5cec755de644256a731be367766c3812855
DIST elixir-1.10.4.tar.gz 2331003 BLAKE2B 8cb54bcb16762ae345ad9d36a25c28696fd5bb57cf97c5037c21458671e001cfe51a722287243c6a70fe3cea65c9c219e759c8312fc168e93974ac5f0870b47a SHA512 844e405cf344539a9d32dc7f1ead0dc1dfb0d70a9ab718269f4e25e5262f611f96346f5be93cf8e34a75c58c6aabb12e8a796c5cb182955922510c270ef169e7
DIST elixir-1.9.4.tar.gz 2250611 BLAKE2B adc363627dc3997684482ac022927aaa4d315afdb8fbc8981e1b88371eb13be80e01084b67288fc88fc51f0015085743d11289e932093d5608e5ac4dfa0823a8 SHA512 c97b93c7438efd7215408525a3b9f2935a1591cce3da3eb31717282d06aff94e8e3d22c405bac40c671bcfe8e73f3dd1ada315f53dee73ceef0bfe2a7c27e86d
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="Elixir programming language"
HOMEPAGE="https://elixir-lang.org"
SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0 ErlPL-1.1"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ~sparc x86"
IUSE=""
DEPEND=">=dev-lang/erlang-18[ssl]"