Merge updates from master

17 files changed, 48 insertions, 9 deletions

diff --git a/app-text/zathura/zathura-0.3.8.ebuild b/app-text/zathura/zathura-0.3.8.ebuild
index 3bbbd76e6463..77c3802a951a 100644
--- a/app-text/zathura/zathura-0.3.8.ebuild
+++ b/app-text/zathura/zathura-0.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ LICENSE="ZLIB"
 SLOT="0"
 IUSE="+magic sqlite synctex test"
 
-RDEPEND=">=dev-libs/girara-0.2.8:3=
+RDEPEND=">=dev-libs/girara-0.2.8:=
 	>=dev-libs/glib-2.32:2=
 	x11-libs/cairo:=
 	>=x11-libs/gtk+-3.6:3
diff --git a/app-text/zathura/zathura-0.4.1.ebuild b/app-text/zathura/zathura-0.4.1.ebuild
index 8021ab0339ec..842130d46e6b 100644
--- a/app-text/zathura/zathura-0.4.1.ebuild
+++ b/app-text/zathura/zathura-0.4.1.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 IUSE="+magic seccomp sqlite synctex test"
 
 RDEPEND="dev-libs/appstream
-	>=dev-libs/girara-0.3.1:0
+	>=dev-libs/girara-0.3.1:=
 	>=dev-libs/glib-2.50:2
 	dev-util/desktop-file-utils
 	dev-python/sphinx
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index 70f20b7aed63..89006688f4d4 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,7 @@ LICENSE="ZLIB"
 SLOT="0"
 IUSE="+magic sqlite synctex test"
 
-RDEPEND=">=dev-libs/girara-0.2.7:3=
+RDEPEND=">=dev-libs/girara-0.2.7:=
 	>=dev-libs/glib-2.32:2=
 	x11-libs/cairo:=
 	>=x11-libs/gtk+-3.6:3
diff --git a/dev-libs/girara/girara-0.2.8.ebuild b/dev-libs/girara/girara-0.2.8.ebuild
index f8ff7c982364..1098c77dd33e 100644
--- a/dev-libs/girara/girara-0.2.8.ebuild
+++ b/dev-libs/girara/girara-0.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
 EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
-SLOT="3"
+SLOT="0"
 if ! [[ ${PV} == 9999* ]]; then
 KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
 fi
diff --git a/dev-libs/girara/girara-9999.ebuild b/dev-libs/girara/girara-9999.ebuild
index 28df72617d4f..d4db899b1913 100644
--- a/dev-libs/girara/girara-9999.ebuild
+++ b/dev-libs/girara/girara-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
 EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
-SLOT="3"
+SLOT="0"
 if ! [[ ${PV} == 9999* ]]; then
 KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 else
diff --git a/profiles/default/linux/amd64/17.0/uclibc/eapi b/profiles/default/linux/amd64/17.0/uclibc/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/uclibc/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.0/uclibc/hardened/eapi b/profiles/default/linux/amd64/17.0/uclibc/hardened/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/uclibc/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.0/uclibc/hardened/parent b/profiles/default/linux/amd64/17.0/uclibc/hardened/parent
new file mode 100644
index 000000000000..45a355b0beba
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/uclibc/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/hardened/amd64
diff --git a/profiles/default/linux/amd64/17.0/uclibc/make.defaults b/profiles/default/linux/amd64/17.0/uclibc/make.defaults
new file mode 100644
index 000000000000..c015f1daecd1
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/uclibc/make.defaults
@@ -0,0 +1,10 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="x86_64-gentoo-linux-uclibc"
+
+# Anthony G. Basile <blueness@gentoo.org> (01 Jul 2014)
+# Multilib-related setup, bug #515130
+MULTILIB_ABIS="amd64"
+CHOST_amd64="${CHOST}"
+LIBDIR_amd64="lib"
diff --git a/profiles/default/linux/amd64/17.0/uclibc/parent b/profiles/default/linux/amd64/17.0/uclibc/parent
new file mode 100644
index 000000000000..a56db381f595
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/uclibc/parent
@@ -0,0 +1,3 @@
+..
+../../../../../arch/amd64/no-multilib
+../../../../../features/uclibc/
diff --git a/profiles/default/linux/x86/17.0/uclibc/eapi b/profiles/default/linux/x86/17.0/uclibc/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/uclibc/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/17.0/uclibc/hardened/eapi b/profiles/default/linux/x86/17.0/uclibc/hardened/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/uclibc/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/17.0/uclibc/hardened/parent b/profiles/default/linux/x86/17.0/uclibc/hardened/parent
new file mode 100644
index 000000000000..45a355b0beba
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/uclibc/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/hardened/amd64
diff --git a/profiles/default/linux/x86/17.0/uclibc/make.defaults b/profiles/default/linux/x86/17.0/uclibc/make.defaults
new file mode 100644
index 000000000000..7242f3043f91
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/uclibc/make.defaults
@@ -0,0 +1,10 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="i686-gentoo-linux-uclibc"
+
+# Anthony G. Basile <blueness@gentoo.org> (01 Jul 2014)
+# Multilib-related setup, bug #515130
+MULTILIB_ABIS="x86"
+CHOST_x86="${CHOST}"
+LIBDIR_x86="lib"
diff --git a/profiles/default/linux/x86/17.0/uclibc/parent b/profiles/default/linux/x86/17.0/uclibc/parent
new file mode 100644
index 000000000000..bf856ff784ae
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/uclibc/parent
@@ -0,0 +1,3 @@
+..
+../../../../../arch/x86
+../../../../../features/uclibc/
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 1c2ea775d5bd..5fb03465be3b 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -351,6 +351,8 @@ x86		default/linux/x86/17.0/musl/selinux			exp
 # @MAINTAINER: uclibc@gentoo.org
 amd64		default/linux/uclibc/amd64				exp
 amd64		hardened/linux/uclibc/amd64				exp
+amd64		default/linux/amd64/17.0/uclibc				exp
+amd64		default/linux/amd64/17.0/uclibc/hardened		exp
 arm		default/linux/uclibc/arm/armv7a				exp
 arm		hardened/linux/uclibc/arm/armv7a			exp
 arm		default/linux/arm/17.0/uclibc/armv6j			exp
@@ -365,6 +367,8 @@ ppc		default/linux/uclibc/ppc				exp
 ppc		hardened/linux/uclibc/ppc				exp
 x86		default/linux/uclibc/x86				exp
 x86		hardened/linux/uclibc/x86				exp
+x86		default/linux/x86/17.0/uclibc				exp
+x86		default/linux/x86/17.0/uclibc/hardened			exp
 
 # These are Gentoo Prefix profiles, maintained by the Prefix team
 # @MAINTAINER: prefix@gentoo.org
diff --git a/profiles/updates/4Q-2018 b/profiles/updates/4Q-2018
new file mode 100644
index 000000000000..f8573dda6ffb
--- /dev/null
+++ b/profiles/updates/4Q-2018
@@ -0,0 +1 @@
+slotmove dev-libs/girara 3 0