[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/, sys-boot/systemd-boot/files/

2022-10-28 Thread Sam James 
commit: 393db9123abfef4ca346cf5758b579053e66e9e0
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 07:40:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 07:41:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=393db912

sys-boot/systemd-boot: drop 249.9

Signed-off-by: Sam James  gentoo.org>

 sys-boot/systemd-boot/Manifest |   1 -
 .../systemd-boot/files/249-libshared-static.patch  |  27 -
 .../systemd-boot/files/249.9-cross-compile.patch   |  23 
 sys-boot/systemd-boot/systemd-boot-249.9.ebuild| 131 -
 4 files changed, 182 deletions(-)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
deleted file mode 100644
index af55a394e2a6..
--- a/sys-boot/systemd-boot/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B 
fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2
 SHA512 
ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164

diff --git a/sys-boot/systemd-boot/files/249-libshared-static.patch 
b/sys-boot/systemd-boot/files/249-libshared-static.patch
deleted file mode 100644
index c08e451af9fc..
--- a/sys-boot/systemd-boot/files/249-libshared-static.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From eac425295227c5deda4536fd647ecf11b643e1ca Mon Sep 17 00:00:00 2001
-From: Mike Gilbert 
-Date: Sun, 29 Aug 2021 09:22:33 -0400
-Subject: [PATCH] Link bootctl against libshared_static
-

- meson.build | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 738879eb21..96042b6906 100644
 a/meson.build
-+++ b/meson.build
-@@ -2150,9 +2150,8 @@ if conf.get('ENABLE_EFI') == 1 and 
conf.get('HAVE_BLKID') == 1
- 'bootctl',
- 'src/boot/bootctl.c',
- include_directories : includes,
--link_with : [libshared],
-+link_with : [libshared_static, libsystemd_static],
- dependencies : [libblkid],
--install_rpath : rootlibexecdir,
- install : true)
- 
- public_programs += executable(
--- 
-2.33.0
-

diff --git a/sys-boot/systemd-boot/files/249.9-cross-compile.patch 
b/sys-boot/systemd-boot/files/249.9-cross-compile.patch
deleted file mode 100644
index e063d303c7d8..
--- a/sys-boot/systemd-boot/files/249.9-cross-compile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 3d7fd38ea938ab194366f40ed7aa413ad33f2fad Mon Sep 17 00:00:00 2001
-From: Yu Watanabe 
-Date: Tue, 21 Dec 2021 20:10:09 +0900
-Subject: [PATCH] meson: fix cross compiling
-
-(cherry picked from commit 3112d756a36993900b70fbff98e69a2a43b970a8)

- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 02495d16c9..c76cab535d 100644
 a/meson.build
-+++ b/meson.build
-@@ -442,7 +442,7 @@ conf.set('SIZEOF_DEV_T', cc.sizeof('dev_t', prefix : 
'#include '))
- conf.set('SIZEOF_INO_T', cc.sizeof('ino_t', prefix : '#include 
'))
- conf.set('SIZEOF_TIME_T', cc.sizeof('time_t', prefix : '#include 
'))
- conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include 
'))
--conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('((struct timex *)0)->freq', prefix 
: '#include '))
-+conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('typeof(((struct timex 
*)0)->freq)', prefix : '#include '))
- 
- decl_headers = '''
- #include 

diff --git a/sys-boot/systemd-boot/systemd-boot-249.9.ebuild 
b/sys-boot/systemd-boot/systemd-boot-249.9.ebuild
deleted file mode 100644
index 0a48d6771a9b..
--- a/sys-boot/systemd-boot/systemd-boot-249.9.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2016-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson python-any-r1 toolchain-funcs
-
-DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/;
-if [[ ${PV} == *.* ]]; then
-   
SRC_URI="https://github.com/systemd/systemd-stable/archive/v${PV}.tar.gz -> 
systemd-stable-${PV}.tar.gz"
-   S="${WORKDIR}/systemd-stable-${PV}"
-else
-   SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> 
systemd-${PV}.tar.gz"
-   S="${WORKDIR}/systemd-${PV}"
-fi
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-RESTRICT="test"
-
-BDEPEND="
-   app-text/docbook-xml-dtd:4.2
-   app-text/docbook-xml-dtd:4.5
-   app-text/docbook-xsl-stylesheets
-   dev-libs/libxslt:0
-   sys-devel/gettext
-   dev-util/gperf
-   virtual/pkgconfig
-   ${PYTHON_DEPS}
-   $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2022-08-20 Thread Arthur Zamarin 
commit: f69e4e4bd05ca4f1331e46732a193e7f6dbe4d79
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Aug 13 07:41:26 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Aug 20 15:53:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f69e4e4b

sys-boot/systemd-boot: use python_has_version

Closes: https://github.com/gentoo/gentoo/pull/26842
Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-boot/systemd-boot/systemd-boot-249.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/systemd-boot/systemd-boot-249.9.ebuild 
b/sys-boot/systemd-boot/systemd-boot-249.9.ebuild
index c0a51a5c2eee..0a48d6771a9b 100644
--- a/sys-boot/systemd-boot/systemd-boot-249.9.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-249.9.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
 "
 
 python_check_deps() {
-   has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+   python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
 }
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2022-05-30 Thread Sam James 
commit: 2635cfaa18acdd90cba3f76a7199785fb89d1c9f
Author: Sam James  gentoo  org>
AuthorDate: Mon May 30 23:33:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 30 23:33:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2635cfaa

sys-boot/systemd-boot: drop 249.6

Signed-off-by: Sam James  gentoo.org>

 sys-boot/systemd-boot/Manifest  |   1 -
 sys-boot/systemd-boot/systemd-boot-249.6.ebuild | 130 
 2 files changed, 131 deletions(-)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index be45979e19b1..af55a394e2a6 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,2 +1 @@
-DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B 
9c0cbaa4319f2ce9a78dbe820d1b6df5191e6c632e2eac9f71f9ff9817564d9b3fc177d2aec0c0daea8ac33bbdc2066ad68a8967cf8857f4af3668b9a3e7d3bf
 SHA512 
7a7791dfe4923c00987b924adcb1cd08c4d17af2b17b4c6c6c701856c6810cfda61f06821c39787339fc05293853c0ea61b9973fcf4495c7bf4f8054ecfae66f
 DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B 
fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2
 SHA512 
ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164

diff --git a/sys-boot/systemd-boot/systemd-boot-249.6.ebuild 
b/sys-boot/systemd-boot/systemd-boot-249.6.ebuild
deleted file mode 100644
index 8ae443c2d75f..
--- a/sys-boot/systemd-boot/systemd-boot-249.6.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 2016-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit meson python-any-r1 toolchain-funcs
-
-DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/;
-if [[ ${PV} == *.* ]]; then
-   
SRC_URI="https://github.com/systemd/systemd-stable/archive/v${PV}.tar.gz -> 
systemd-stable-${PV}.tar.gz"
-   S="${WORKDIR}/systemd-stable-${PV}"
-else
-   SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> 
systemd-${PV}.tar.gz"
-   S="${WORKDIR}/systemd-${PV}"
-fi
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-RESTRICT="test"
-
-BDEPEND="
-   app-text/docbook-xml-dtd:4.2
-   app-text/docbook-xml-dtd:4.5
-   app-text/docbook-xsl-stylesheets
-   dev-libs/libxslt:0
-   sys-devel/gettext
-   dev-util/gperf
-   virtual/pkgconfig
-   ${PYTHON_DEPS}
-   $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-   has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-COMMON_DEPEND="
-   >=sys-apps/util-linux-2.30
-"
-DEPEND="${COMMON_DEPEND}
-   >=sys-boot/gnu-efi-3.0.2
-   sys-libs/libcap
-"
-RDEPEND="${COMMON_DEPEND}
-   !sys-apps/systemd
-"
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-PATCHES=(
-   "${FILESDIR}/249-libshared-static.patch"
-)
-
-src_configure() {
-   # https://bugs.gentoo.org/725794
-   tc-export OBJCOPY
-
-   local emesonargs=(
-   -Dblkid=true
-   -Defi=true
-   -Dgnu-efi=true
-   -Defi-cc="$(tc-getCC)"
-   -Defi-ld="$(tc-getLD)"
-   -Defi-libdir="/usr/$(get_libdir)"
-   -Dsplit-usr=true
-   -Drootprefix="${EPREFIX:-/}"
-
-   -Dacl=false
-   -Dapparmor=false
-   -Daudit=false
-   -Dbzip2=false
-   -Delfutils=false
-   -Dgcrypt=false
-   -Dgnutls=false
-   -Dkmod=false
-   -Dlibcryptsetup=false
-   -Dlibcurl=false
-   -Dlibidn=false
-   -Dlibidn2=false
-   -Dlibiptc=false
-   -Dlz4=false
-   -Dmicrohttpd=false
-   -Dpam=false
-   -Dqrencode=false
-   -Dseccomp=false
-   -Dselinux=false
-   -Dxkbcommon=false
-   -Dxz=false
-   )
-   meson_src_configure
-}
-
-set_efi_arch() {
-   case "$(tc-arch)" in
-   amd64) efi_arch=x64 ;;
-   arm)   efi_arch=arm ;;
-   arm64) efi_arch=aa64 ;;
-   x86)   efi_arch=x86 ;;
-   esac
-}
-
-src_compile() {
-   local efi_arch
-   set_efi_arch
-   local targets=(
-   bootctl
-   man/bootctl.1
-   man/kernel-install.8
-   src/boot/efi/linux${efi_arch}.{efi,elf}.stub
-   src/boot/efi/systemd-boot${efi_arch}.efi
-   )
-   meson_src_compile "${targets[@]}"
-}
-
-src_install() {
-   local efi_arch
-   set_efi_arch
-   dobin "${BUILD_DIR}"/bootctl

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2022-04-17 Thread Sam James 
commit: 95b3ce8dc893bd0dd0cb5dcc2f1bd04478030701
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 17 08:17:54 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 17 08:17:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95b3ce8d

sys-boot/systemd-boot: fix dependency on systemd-utils[boot]

Typo w/ udev.

Signed-off-by: Sam James  gentoo.org>

 .../{systemd-boot-250.ebuild => systemd-boot-250-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/systemd-boot/systemd-boot-250.ebuild 
b/sys-boot/systemd-boot/systemd-boot-250-r1.ebuild
similarity index 87%
rename from sys-boot/systemd-boot/systemd-boot-250.ebuild
rename to sys-boot/systemd-boot/systemd-boot-250-r1.ebuild
index 0e9e4d355e4d..ccebd831dc8f 100644
--- a/sys-boot/systemd-boot/systemd-boot-250.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-250-r1.ebuild
@@ -10,4 +10,4 @@ LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 
-RDEPEND="sys-apps/systemd-utils[udev]"
+RDEPEND="sys-apps/systemd-utils[boot]"

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2022-04-16 Thread Mike Gilbert 
commit: 71296f3f4c9f45819fe1d3b584223aec8e1e7fba
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Apr 12 15:32:59 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Apr 16 23:12:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71296f3f

sys-boot/systemd-boot: add 250 to pull in systemd-utils

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-boot/systemd-boot/systemd-boot-250.ebuild | 13 +
 1 file changed, 13 insertions(+)

diff --git a/sys-boot/systemd-boot/systemd-boot-250.ebuild 
b/sys-boot/systemd-boot/systemd-boot-250.ebuild
new file mode 100644
index ..0e9e4d355e4d
--- /dev/null
+++ b/sys-boot/systemd-boot/systemd-boot-250.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual package to depend on sys-apps/systemd-utils"
+HOMEPAGE="https://systemd.io/;
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="sys-apps/systemd-utils[udev]"

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/, sys-boot/systemd-boot/files/

2022-01-15 Thread Mike Gilbert 
commit: 093f87aee2396c87ddecadbaa7027730f32f4516
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Jan 15 16:12:10 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jan 15 16:12:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=093f87ae

sys-boot/systemd-boot: backport cross compile fix

Bug: https://bugs.gentoo.org/831221
Signed-off-by: Mike Gilbert  gentoo.org>

 .../systemd-boot/files/249.9-cross-compile.patch   | 23 ++
 sys-boot/systemd-boot/systemd-boot-249.9.ebuild|  1 +
 2 files changed, 24 insertions(+)

diff --git a/sys-boot/systemd-boot/files/249.9-cross-compile.patch 
b/sys-boot/systemd-boot/files/249.9-cross-compile.patch
new file mode 100644
index ..e063d303c7d8
--- /dev/null
+++ b/sys-boot/systemd-boot/files/249.9-cross-compile.patch
@@ -0,0 +1,23 @@
+From 3d7fd38ea938ab194366f40ed7aa413ad33f2fad Mon Sep 17 00:00:00 2001
+From: Yu Watanabe 
+Date: Tue, 21 Dec 2021 20:10:09 +0900
+Subject: [PATCH] meson: fix cross compiling
+
+(cherry picked from commit 3112d756a36993900b70fbff98e69a2a43b970a8)
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 02495d16c9..c76cab535d 100644
+--- a/meson.build
 b/meson.build
+@@ -442,7 +442,7 @@ conf.set('SIZEOF_DEV_T', cc.sizeof('dev_t', prefix : 
'#include '))
+ conf.set('SIZEOF_INO_T', cc.sizeof('ino_t', prefix : '#include 
'))
+ conf.set('SIZEOF_TIME_T', cc.sizeof('time_t', prefix : '#include 
'))
+ conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include 
'))
+-conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('((struct timex *)0)->freq', prefix 
: '#include '))
++conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('typeof(((struct timex 
*)0)->freq)', prefix : '#include '))
+ 
+ decl_headers = '''
+ #include 

diff --git a/sys-boot/systemd-boot/systemd-boot-249.9.ebuild 
b/sys-boot/systemd-boot/systemd-boot-249.9.ebuild
index 143c5280b8d8..c0a51a5c2eee 100644
--- a/sys-boot/systemd-boot/systemd-boot-249.9.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-249.9.ebuild
@@ -54,6 +54,7 @@ QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
 
 PATCHES=(
"${FILESDIR}/249-libshared-static.patch"
+   "${FILESDIR}/249.9-cross-compile.patch"
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2022-01-12 Thread Sam James 
commit: e7014e9de8945c3e42410e66ba3987162997c83c
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 13 04:42:16 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 13 04:42:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7014e9d

sys-boot/systemd-boot: add 249.9

Signed-off-by: Sam James  gentoo.org>

 sys-boot/systemd-boot/Manifest  |   1 +
 sys-boot/systemd-boot/systemd-boot-249.9.ebuild | 130 
 2 files changed, 131 insertions(+)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index ec8fbe294598..be45979e19b1 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1 +1,2 @@
 DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B 
9c0cbaa4319f2ce9a78dbe820d1b6df5191e6c632e2eac9f71f9ff9817564d9b3fc177d2aec0c0daea8ac33bbdc2066ad68a8967cf8857f4af3668b9a3e7d3bf
 SHA512 
7a7791dfe4923c00987b924adcb1cd08c4d17af2b17b4c6c6c701856c6810cfda61f06821c39787339fc05293853c0ea61b9973fcf4495c7bf4f8054ecfae66f
+DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B 
fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2
 SHA512 
ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164

diff --git a/sys-boot/systemd-boot/systemd-boot-249.9.ebuild 
b/sys-boot/systemd-boot/systemd-boot-249.9.ebuild
new file mode 100644
index ..143c5280b8d8
--- /dev/null
+++ b/sys-boot/systemd-boot/systemd-boot-249.9.ebuild
@@ -0,0 +1,130 @@
+# Copyright 2016-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson python-any-r1 toolchain-funcs
+
+DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/;
+if [[ ${PV} == *.* ]]; then
+   
SRC_URI="https://github.com/systemd/systemd-stable/archive/v${PV}.tar.gz -> 
systemd-stable-${PV}.tar.gz"
+   S="${WORKDIR}/systemd-stable-${PV}"
+else
+   SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> 
systemd-${PV}.tar.gz"
+   S="${WORKDIR}/systemd-${PV}"
+fi
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+RESTRICT="test"
+
+BDEPEND="
+   app-text/docbook-xml-dtd:4.2
+   app-text/docbook-xml-dtd:4.5
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt:0
+   sys-devel/gettext
+   dev-util/gperf
+   virtual/pkgconfig
+   ${PYTHON_DEPS}
+   $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+   has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+COMMON_DEPEND="
+   >=sys-apps/util-linux-2.30
+"
+DEPEND="${COMMON_DEPEND}
+   >=sys-boot/gnu-efi-3.0.2
+   sys-libs/libcap
+"
+RDEPEND="${COMMON_DEPEND}
+   !sys-apps/systemd
+"
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+PATCHES=(
+   "${FILESDIR}/249-libshared-static.patch"
+)
+
+src_configure() {
+   # https://bugs.gentoo.org/725794
+   tc-export OBJCOPY
+
+   local emesonargs=(
+   -Dblkid=true
+   -Defi=true
+   -Dgnu-efi=true
+   -Defi-cc="$(tc-getCC)"
+   -Defi-ld="$(tc-getLD)"
+   -Defi-libdir="/usr/$(get_libdir)"
+   -Dsplit-usr=true
+   -Drootprefix="${EPREFIX:-/}"
+
+   -Dacl=false
+   -Dapparmor=false
+   -Daudit=false
+   -Dbzip2=false
+   -Delfutils=false
+   -Dgcrypt=false
+   -Dgnutls=false
+   -Dkmod=false
+   -Dlibcryptsetup=false
+   -Dlibcurl=false
+   -Dlibidn=false
+   -Dlibidn2=false
+   -Dlibiptc=false
+   -Dlz4=false
+   -Dmicrohttpd=false
+   -Dpam=false
+   -Dqrencode=false
+   -Dseccomp=false
+   -Dselinux=false
+   -Dxkbcommon=false
+   -Dxz=false
+   )
+   meson_src_configure
+}
+
+set_efi_arch() {
+   case "$(tc-arch)" in
+   amd64) efi_arch=x64 ;;
+   arm)   efi_arch=arm ;;
+   arm64) efi_arch=aa64 ;;
+   x86)   efi_arch=x86 ;;
+   esac
+}
+
+src_compile() {
+   local efi_arch
+   set_efi_arch
+   local targets=(
+   bootctl
+   man/bootctl.1
+   man/kernel-install.8
+   src/boot/efi/linux${efi_arch}.{efi,elf}.stub
+   src/boot/efi/systemd-boot${efi_arch}.efi
+   )
+   meson_src_compile "${targets[@]}"
+}
+
+src_install() {
+   local efi_arch
+   set_efi_arch
+   dobin "${BUILD_DIR}"/bootctl

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/, sys-boot/systemd-boot/files/

2021-11-18 Thread Mike Gilbert 
commit: 63f94351d52a140018ec2f9432131a3c8a3327bd
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Nov 18 20:55:41 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Nov 18 20:56:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63f94351

sys-boot/systemd-boot: add 249.6, drop 249

Closes: https://bugs.gentoo.org/824026
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-boot/systemd-boot/Manifest |  2 +-
 .../files/249-linux-headers-5-15.patch | 22 --
 ...d-boot-249.ebuild => systemd-boot-249.6.ebuild} | 11 +++
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 209a35c38f4e..ec8fbe294598 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1 +1 @@
-DIST systemd-249.tar.gz 10588828 BLAKE2B 
f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27
 SHA512 
0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c
+DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B 
9c0cbaa4319f2ce9a78dbe820d1b6df5191e6c632e2eac9f71f9ff9817564d9b3fc177d2aec0c0daea8ac33bbdc2066ad68a8967cf8857f4af3668b9a3e7d3bf
 SHA512 
7a7791dfe4923c00987b924adcb1cd08c4d17af2b17b4c6c6c701856c6810cfda61f06821c39787339fc05293853c0ea61b9973fcf4495c7bf4f8054ecfae66f

diff --git a/sys-boot/systemd-boot/files/249-linux-headers-5-15.patch 
b/sys-boot/systemd-boot/files/249-linux-headers-5-15.patch
deleted file mode 100644
index 398119d77432..
--- a/sys-boot/systemd-boot/files/249-linux-headers-5-15.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/systemd/systemd-stable/pull/132/commits/92bbfcdc733d39ec4097d8678bc92a7aaaf78ae1.patch
-https://bugs.gentoo.org/823810
-
-From: Chris Packham 
-Date: Fri, 10 Sep 2021 09:51:36 +1200
-Subject: [PATCH 1/2] basic/linux: Sync if_arp.h with Linux 5.14
-
-ARPHRD_MCTP was added in 5.14. Sync if_arp.h to pick up the definition
-
-Fixes #20694
-
-(cherry picked from commit 7c5b9952c4f6e2b72f90edbe439982528b7cf223)
 a/src/basic/linux/if_arp.h
-+++ b/src/basic/linux/if_arp.h
-@@ -54,6 +54,7 @@
- #define ARPHRD_X25271 /* CCITT X.25   */
- #define ARPHRD_HWX25  272 /* Boards with X.25 in firmware */
- #define ARPHRD_CAN280 /* Controller Area Network  */
-+#define ARPHRD_MCTP   290
- #define ARPHRD_PPP512
- #define ARPHRD_CISCO  513 /* Cisco HDLC   */
- #define ARPHRD_HDLC   ARPHRD_CISCO

diff --git a/sys-boot/systemd-boot/systemd-boot-249.ebuild 
b/sys-boot/systemd-boot/systemd-boot-249.6.ebuild
similarity index 89%
rename from sys-boot/systemd-boot/systemd-boot-249.ebuild
rename to sys-boot/systemd-boot/systemd-boot-249.6.ebuild
index 6a1255a2e06b..8ae443c2d75f 100644
--- a/sys-boot/systemd-boot/systemd-boot-249.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-249.6.ebuild
@@ -8,7 +8,13 @@ inherit meson python-any-r1 toolchain-funcs
 
 DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/;
-SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> 
systemd-${PV}.tar.gz"
+if [[ ${PV} == *.* ]]; then
+   
SRC_URI="https://github.com/systemd/systemd-stable/archive/v${PV}.tar.gz -> 
systemd-stable-${PV}.tar.gz"
+   S="${WORKDIR}/systemd-stable-${PV}"
+else
+   SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> 
systemd-${PV}.tar.gz"
+   S="${WORKDIR}/systemd-${PV}"
+fi
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
@@ -46,11 +52,8 @@ RDEPEND="${COMMON_DEPEND}
 QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
 QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
 
-S="${WORKDIR}/systemd-${PV}"
-
 PATCHES=(
"${FILESDIR}/249-libshared-static.patch"
-   "${FILESDIR}/249-linux-headers-5-15.patch"
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/, sys-boot/systemd-boot/files/

2021-11-16 Thread Sam James 
commit: 55743ff045f0e8fdbfec92d92d7913e45c5663ec
Author: Sam James  gentoo  org>
AuthorDate: Tue Nov 16 12:05:53 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov 16 12:05:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55743ff0

sys-boot/systemd-boot: fix build with linux-headers-5.15

Closes: https://bugs.gentoo.org/823810
Signed-off-by: Sam James  gentoo.org>

 .../files/249-linux-headers-5-15.patch | 22 ++
 sys-boot/systemd-boot/systemd-boot-249.ebuild  |  1 +
 2 files changed, 23 insertions(+)

diff --git a/sys-boot/systemd-boot/files/249-linux-headers-5-15.patch 
b/sys-boot/systemd-boot/files/249-linux-headers-5-15.patch
new file mode 100644
index ..398119d77432
--- /dev/null
+++ b/sys-boot/systemd-boot/files/249-linux-headers-5-15.patch
@@ -0,0 +1,22 @@
+https://github.com/systemd/systemd-stable/pull/132/commits/92bbfcdc733d39ec4097d8678bc92a7aaaf78ae1.patch
+https://bugs.gentoo.org/823810
+
+From: Chris Packham 
+Date: Fri, 10 Sep 2021 09:51:36 +1200
+Subject: [PATCH 1/2] basic/linux: Sync if_arp.h with Linux 5.14
+
+ARPHRD_MCTP was added in 5.14. Sync if_arp.h to pick up the definition
+
+Fixes #20694
+
+(cherry picked from commit 7c5b9952c4f6e2b72f90edbe439982528b7cf223)
+--- a/src/basic/linux/if_arp.h
 b/src/basic/linux/if_arp.h
+@@ -54,6 +54,7 @@
+ #define ARPHRD_X25271 /* CCITT X.25   */
+ #define ARPHRD_HWX25  272 /* Boards with X.25 in firmware */
+ #define ARPHRD_CAN280 /* Controller Area Network  */
++#define ARPHRD_MCTP   290
+ #define ARPHRD_PPP512
+ #define ARPHRD_CISCO  513 /* Cisco HDLC   */
+ #define ARPHRD_HDLC   ARPHRD_CISCO

diff --git a/sys-boot/systemd-boot/systemd-boot-249.ebuild 
b/sys-boot/systemd-boot/systemd-boot-249.ebuild
index d9ed991ef5c6..6a1255a2e06b 100644
--- a/sys-boot/systemd-boot/systemd-boot-249.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-249.ebuild
@@ -50,6 +50,7 @@ S="${WORKDIR}/systemd-${PV}"
 
 PATCHES=(
"${FILESDIR}/249-libshared-static.patch"
+   "${FILESDIR}/249-linux-headers-5-15.patch"
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/files/, sys-boot/systemd-boot/

2021-09-05 Thread Mike Gilbert 
commit: 979528fd1a15ddb2c202bbf30890cdcc6ef8d0a5
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Sep  5 19:01:07 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Sep  5 19:01:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=979528fd

sys-boot/systemd-boot: drop 245

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-boot/systemd-boot/Manifest |   1 -
 .../systemd-boot/files/237-libshared-static.patch  |  15 ---
 sys-boot/systemd-boot/systemd-boot-245.ebuild  | 120 -
 3 files changed, 136 deletions(-)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 9b4446a019c..209a35c38f4 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,2 +1 @@
-DIST systemd-245.tar.gz 8993479 BLAKE2B 
be0b1fca5ba8585978f570868bc9135c1fee78ea64dcdf8b1a3419e856a83da90104ed2f86e5f3e5b0b6f29d4b34f603bfe1e4cbc61ccf71bedce547db62ff35
 SHA512 
1b80d0e02472dfc4197f11dab4f56cf90e8a6e105ce19f837cb11335b6d8577ed49031dad94cdb41aa9bdc06ec8eec62c8e9246272b83935e7bb9dcd3cd8c012
 DIST systemd-249.tar.gz 10588828 BLAKE2B 
f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27
 SHA512 
0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c

diff --git a/sys-boot/systemd-boot/files/237-libshared-static.patch 
b/sys-boot/systemd-boot/files/237-libshared-static.patch
deleted file mode 100644
index 9966a5f7916..000
--- a/sys-boot/systemd-boot/files/237-libshared-static.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 36a62d280..87f8da29b 100644
 a/meson.build
-+++ b/meson.build
-@@ -1662,9 +1662,8 @@ if conf.get('ENABLE_EFI') == 1 and 
conf.get('HAVE_BLKID') == 1
- exe = executable('bootctl',
-  'src/boot/bootctl.c',
-  include_directories : includes,
-- link_with : [libshared],
-+ link_with : [libshared_static, libsystemd_static],
-  dependencies : [libblkid],
-- install_rpath : rootlibexecdir,
-  install : true)
- public_programs += [exe]
- endif

diff --git a/sys-boot/systemd-boot/systemd-boot-245.ebuild 
b/sys-boot/systemd-boot/systemd-boot-245.ebuild
deleted file mode 100644
index 7767ac23cf9..000
--- a/sys-boot/systemd-boot/systemd-boot-245.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 2016-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit meson python-any-r1 toolchain-funcs
-
-DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/;
-SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> 
systemd-${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-RESTRICT="test"
-
-BDEPEND="
-   ${PYTHON_DEPS}
-   app-text/docbook-xml-dtd:4.2
-   app-text/docbook-xml-dtd:4.5
-   app-text/docbook-xsl-stylesheets
-   dev-libs/libxslt:0
-   >=dev-util/intltool-0.50
-   dev-util/gperf
-   >=dev-util/patchelf-0.10
-   virtual/pkgconfig
-"
-COMMON_DEPEND="
-   >=sys-apps/util-linux-2.30
-"
-DEPEND="${COMMON_DEPEND}
-   >=sys-boot/gnu-efi-3.0.2
-   sys-libs/libcap
-"
-RDEPEND="${COMMON_DEPEND}
-   !sys-apps/systemd
-"
-
-S="${WORKDIR}/systemd-${PV}"
-
-PATCHES=(
-   "${FILESDIR}/237-libshared-static.patch"
-)
-
-src_configure() {
-   # https://bugs.gentoo.org/725794
-   tc-export OBJCOPY
-
-   local emesonargs=(
-   -Dblkid=true
-   -Defi=true
-   -Dgnu-efi=true
-   -Defi-cc="$(tc-getCC)"
-   -Defi-ld="$(tc-getLD)"
-   -Defi-libdir="/usr/$(get_libdir)"
-   -Dsplit-usr=true
-   -Drootprefix="${EPREFIX:-/}"
-
-   -Dacl=false
-   -Dapparmor=false
-   -Daudit=false
-   -Dbzip2=false
-   -Delfutils=false
-   -Dgcrypt=false
-   -Dgnutls=false
-   -Dkmod=false
-   -Dlibcryptsetup=false
-   -Dlibcurl=false
-   -Dlibidn=false
-   -Dlibidn2=false
-   -Dlibiptc=false
-   -Dlz4=false
-   -Dmicrohttpd=false
-   -Dpam=false
-   -Dqrencode=false
-   -Dseccomp=false
-   -Dselinux=false
-   -Dxkbcommon=false
-   -Dxz=false
-   )
-   meson_src_configure
-}
-
-set_efi_arch() {
-   case "$(tc-arch)" in
-   amd64) efi_arch=x64 ;;
-   arm)   efi_arch=arm ;;

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/, sys-boot/systemd-boot/files/

2021-08-29 Thread Mike Gilbert 
commit: b961b80c1323371ad7d2f2b38cb049ae9a0ee7a6
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Aug 29 13:42:15 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Aug 29 13:44:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b961b80c

sys-boot/systemd-boot: add 249

Closes: https://bugs.gentoo.org/810910
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-boot/systemd-boot/Manifest |   1 +
 .../systemd-boot/files/249-libshared-static.patch  |  27 +
 sys-boot/systemd-boot/systemd-boot-249.ebuild  | 126 +
 3 files changed, 154 insertions(+)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 7af34cf96f8..9b4446a019c 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1 +1,2 @@
 DIST systemd-245.tar.gz 8993479 BLAKE2B 
be0b1fca5ba8585978f570868bc9135c1fee78ea64dcdf8b1a3419e856a83da90104ed2f86e5f3e5b0b6f29d4b34f603bfe1e4cbc61ccf71bedce547db62ff35
 SHA512 
1b80d0e02472dfc4197f11dab4f56cf90e8a6e105ce19f837cb11335b6d8577ed49031dad94cdb41aa9bdc06ec8eec62c8e9246272b83935e7bb9dcd3cd8c012
+DIST systemd-249.tar.gz 10588828 BLAKE2B 
f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27
 SHA512 
0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c

diff --git a/sys-boot/systemd-boot/files/249-libshared-static.patch 
b/sys-boot/systemd-boot/files/249-libshared-static.patch
new file mode 100644
index 000..c08e451af9f
--- /dev/null
+++ b/sys-boot/systemd-boot/files/249-libshared-static.patch
@@ -0,0 +1,27 @@
+From eac425295227c5deda4536fd647ecf11b643e1ca Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Sun, 29 Aug 2021 09:22:33 -0400
+Subject: [PATCH] Link bootctl against libshared_static
+
+---
+ meson.build | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 738879eb21..96042b6906 100644
+--- a/meson.build
 b/meson.build
+@@ -2150,9 +2150,8 @@ if conf.get('ENABLE_EFI') == 1 and 
conf.get('HAVE_BLKID') == 1
+ 'bootctl',
+ 'src/boot/bootctl.c',
+ include_directories : includes,
+-link_with : [libshared],
++link_with : [libshared_static, libsystemd_static],
+ dependencies : [libblkid],
+-install_rpath : rootlibexecdir,
+ install : true)
+ 
+ public_programs += executable(
+-- 
+2.33.0
+

diff --git a/sys-boot/systemd-boot/systemd-boot-249.ebuild 
b/sys-boot/systemd-boot/systemd-boot-249.ebuild
new file mode 100644
index 000..d9ed991ef5c
--- /dev/null
+++ b/sys-boot/systemd-boot/systemd-boot-249.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2016-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit meson python-any-r1 toolchain-funcs
+
+DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/;
+SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> 
systemd-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+RESTRICT="test"
+
+BDEPEND="
+   app-text/docbook-xml-dtd:4.2
+   app-text/docbook-xml-dtd:4.5
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt:0
+   sys-devel/gettext
+   dev-util/gperf
+   virtual/pkgconfig
+   ${PYTHON_DEPS}
+   $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+   has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+COMMON_DEPEND="
+   >=sys-apps/util-linux-2.30
+"
+DEPEND="${COMMON_DEPEND}
+   >=sys-boot/gnu-efi-3.0.2
+   sys-libs/libcap
+"
+RDEPEND="${COMMON_DEPEND}
+   !sys-apps/systemd
+"
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+S="${WORKDIR}/systemd-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/249-libshared-static.patch"
+)
+
+src_configure() {
+   # https://bugs.gentoo.org/725794
+   tc-export OBJCOPY
+
+   local emesonargs=(
+   -Dblkid=true
+   -Defi=true
+   -Dgnu-efi=true
+   -Defi-cc="$(tc-getCC)"
+   -Defi-ld="$(tc-getLD)"
+   -Defi-libdir="/usr/$(get_libdir)"
+   -Dsplit-usr=true
+   -Drootprefix="${EPREFIX:-/}"
+
+   -Dacl=false
+   -Dapparmor=false
+   -Daudit=false
+   -Dbzip2=false
+   -Delfutils=false
+   -Dgcrypt=false
+   -Dgnutls=false
+   -Dkmod=false
+   -Dlibcryptsetup=false
+   -Dlibcurl=false
+   -Dlibidn=false
+

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2021-01-24 Thread Mike Gilbert 
commit: 1502dc73c98b4092442f9cceb81e22a9799910fe
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Jan 24 19:04:40 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Jan 24 19:06:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1502dc73

sys-boot/systemd-boot: use python-any-r1

Closes: https://bugs.gentoo.org/766390
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-boot/systemd-boot/systemd-boot-245.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-boot/systemd-boot/systemd-boot-245.ebuild 
b/sys-boot/systemd-boot/systemd-boot-245.ebuild
index 748f866fdec..7767ac23cf9 100644
--- a/sys-boot/systemd-boot/systemd-boot-245.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-245.ebuild
@@ -1,9 +1,10 @@
-# Copyright 2016-2020 Gentoo Authors
+# Copyright 2016-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
 
-inherit meson toolchain-funcs
+inherit meson python-any-r1 toolchain-funcs
 
 DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/;
@@ -16,6 +17,7 @@ IUSE=""
 RESTRICT="test"
 
 BDEPEND="
+   ${PYTHON_DEPS}
app-text/docbook-xml-dtd:4.2
app-text/docbook-xml-dtd:4.5
app-text/docbook-xsl-stylesheets

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2020-10-23 Thread Georgy Yakovlev 
commit: be01c045459b002719a0953bce51360df1176daf
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Oct 24 02:27:07 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Oct 24 04:54:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be01c045

sys-boot/systemd-boot: add ~arm64 keyword

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-boot/systemd-boot/systemd-boot-245.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/systemd-boot/systemd-boot-245.ebuild 
b/sys-boot/systemd-boot/systemd-boot-245.ebuild
index 94fa4ee8aef..748f866fdec 100644
--- a/sys-boot/systemd-boot/systemd-boot-245.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-245.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${P
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE=""
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2020-09-15 Thread Mike Gilbert 
commit: 1e147700d8c85629684a8252e11a76e8d9b8d010
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Sep 15 14:18:20 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Sep 15 14:18:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e147700

sys-boot/systemd-boot: remove old

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-boot/systemd-boot/Manifest|   1 -
 sys-boot/systemd-boot/systemd-boot-243.ebuild | 114 --
 2 files changed, 115 deletions(-)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index abc1d65828e..7af34cf96f8 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,2 +1 @@
-DIST systemd-243.tar.gz 8242522 BLAKE2B 
89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb
 SHA512 
56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
 DIST systemd-245.tar.gz 8993479 BLAKE2B 
be0b1fca5ba8585978f570868bc9135c1fee78ea64dcdf8b1a3419e856a83da90104ed2f86e5f3e5b0b6f29d4b34f603bfe1e4cbc61ccf71bedce547db62ff35
 SHA512 
1b80d0e02472dfc4197f11dab4f56cf90e8a6e105ce19f837cb11335b6d8577ed49031dad94cdb41aa9bdc06ec8eec62c8e9246272b83935e7bb9dcd3cd8c012

diff --git a/sys-boot/systemd-boot/systemd-boot-243.ebuild 
b/sys-boot/systemd-boot/systemd-boot-243.ebuild
deleted file mode 100644
index 99dbbaa4668..000
--- a/sys-boot/systemd-boot/systemd-boot-243.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2016-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson toolchain-funcs
-
-DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/;
-SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> 
systemd-${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="test"
-
-BDEPEND="
-   app-text/docbook-xml-dtd:4.2
-   app-text/docbook-xml-dtd:4.5
-   app-text/docbook-xsl-stylesheets
-   dev-libs/libxslt:0
-   >=dev-util/intltool-0.50
-   dev-util/gperf
-   >=dev-util/patchelf-0.10
-   virtual/pkgconfig
-"
-COMMON_DEPEND="
-   >=sys-apps/util-linux-2.30
-"
-DEPEND="${COMMON_DEPEND}
-   >=sys-boot/gnu-efi-3.0.2
-   sys-libs/libcap
-"
-RDEPEND="${COMMON_DEPEND}
-   !sys-apps/systemd
-"
-
-S="${WORKDIR}/systemd-${PV}"
-
-PATCHES=(
-   "${FILESDIR}/237-libshared-static.patch"
-)
-
-src_configure() {
-   local emesonargs=(
-   -Dblkid=true
-   -Defi=true
-   -Dgnu-efi=true
-   -Defi-cc="$(tc-getCC)"
-   -Defi-ld="$(tc-getLD)"
-   -Dsplit-usr=true
-   -Drootprefix="${EPREFIX:-/}"
-
-   -Dacl=false
-   -Dapparmor=false
-   -Daudit=false
-   -Dbzip2=false
-   -Delfutils=false
-   -Dgcrypt=false
-   -Dgnutls=false
-   -Dkmod=false
-   -Dlibcryptsetup=false
-   -Dlibcurl=false
-   -Dlibidn=false
-   -Dlibidn2=false
-   -Dlibiptc=false
-   -Dlz4=false
-   -Dmicrohttpd=false
-   -Dpam=false
-   -Dqrencode=false
-   -Dseccomp=false
-   -Dselinux=false
-   -Dxkbcommon=false
-   -Dxz=false
-   )
-   meson_src_configure
-}
-
-set_efi_arch() {
-   case "$(tc-arch)" in
-   amd64) efi_arch=x64 ;;
-   arm)   efi_arch=arm ;;
-   arm64) efi_arch=aa64 ;;
-   x86)   efi_arch=x86 ;;
-   esac
-}
-
-src_compile() {
-   local efi_arch
-   set_efi_arch
-   local targets=(
-   bootctl
-   man/bootctl.1
-   man/kernel-install.8
-   src/boot/efi/linux${efi_arch}.efi.stub
-   src/boot/efi/systemd-boot${efi_arch}.efi
-   )
-   cd "${BUILD_DIR}" || die
-   eninja "${targets[@]}"
-   patchelf --remove-rpath bootctl || die
-}
-
-src_install() {
-   local efi_arch
-   set_efi_arch
-   dobin "${BUILD_DIR}"/bootctl src/kernel-install/kernel-install
-   doman "${BUILD_DIR}"/man/{bootctl.1,kernel-install.8}
-   exeinto usr/lib/kernel/install.d
-   doexe src/kernel-install/{50-depmod,90-loaderentry}.install
-   insinto usr/lib/systemd/boot/efi
-   doins 
"${BUILD_DIR}"/src/boot/efi/{linux${efi_arch}.efi.stub,systemd-boot${efi_arch}.efi}
-   einstalldocs
-}

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2020-09-15 Thread Mike Gilbert 
commit: 3a0814c17576149e7819a27c34fce627ea043c7e
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Sep 15 14:17:40 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Sep 15 14:17:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a0814c1

sys-boot/systemd-boot: pass efi-libdir to meson configure

Closes: https://bugs.gentoo.org/741951
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-boot/systemd-boot/systemd-boot-245.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-boot/systemd-boot/systemd-boot-245.ebuild 
b/sys-boot/systemd-boot/systemd-boot-245.ebuild
index 376d996987d..94fa4ee8aef 100644
--- a/sys-boot/systemd-boot/systemd-boot-245.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-245.ebuild
@@ -52,6 +52,7 @@ src_configure() {
-Dgnu-efi=true
-Defi-cc="$(tc-getCC)"
-Defi-ld="$(tc-getLD)"
+   -Defi-libdir="/usr/$(get_libdir)"
-Dsplit-usr=true
-Drootprefix="${EPREFIX:-/}"

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2020-07-11 Thread Mike Gilbert 
commit: 1e6b42df5b2208608e0a5e0c87c9faa020b4252f
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Jul 11 22:45:49 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jul 11 22:45:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e6b42df

sys-boot/systemd-boot: export OBJCOPY

Closes: https://bugs.gentoo.org/725794
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-boot/systemd-boot/systemd-boot-245.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-boot/systemd-boot/systemd-boot-245.ebuild 
b/sys-boot/systemd-boot/systemd-boot-245.ebuild
index df34ee3df7f..376d996987d 100644
--- a/sys-boot/systemd-boot/systemd-boot-245.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-245.ebuild
@@ -43,6 +43,9 @@ PATCHES=(
 )
 
 src_configure() {
+   # https://bugs.gentoo.org/725794
+   tc-export OBJCOPY
+
local emesonargs=(
-Dblkid=true
-Defi=true

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2020-03-07 Thread Mike Gilbert 
commit: 9f7ff07f4d394695c2db796d44aeb60e9eef0e43
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Mar  8 04:04:22 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Mar  8 04:04:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f7ff07f

sys-boot/systemd-boot: remove old

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-boot/systemd-boot/Manifest|   1 -
 sys-boot/systemd-boot/systemd-boot-241.ebuild | 114 --
 2 files changed, 115 deletions(-)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index c628b654e3c..abc1d65828e 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,3 +1,2 @@
-DIST systemd-241.tar.gz 7640538 BLAKE2B 
69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a
 SHA512 
a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e
 DIST systemd-243.tar.gz 8242522 BLAKE2B 
89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb
 SHA512 
56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
 DIST systemd-245.tar.gz 8993479 BLAKE2B 
be0b1fca5ba8585978f570868bc9135c1fee78ea64dcdf8b1a3419e856a83da90104ed2f86e5f3e5b0b6f29d4b34f603bfe1e4cbc61ccf71bedce547db62ff35
 SHA512 
1b80d0e02472dfc4197f11dab4f56cf90e8a6e105ce19f837cb11335b6d8577ed49031dad94cdb41aa9bdc06ec8eec62c8e9246272b83935e7bb9dcd3cd8c012

diff --git a/sys-boot/systemd-boot/systemd-boot-241.ebuild 
b/sys-boot/systemd-boot/systemd-boot-241.ebuild
deleted file mode 100644
index 99dbbaa4668..000
--- a/sys-boot/systemd-boot/systemd-boot-241.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2016-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson toolchain-funcs
-
-DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/;
-SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> 
systemd-${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="test"
-
-BDEPEND="
-   app-text/docbook-xml-dtd:4.2
-   app-text/docbook-xml-dtd:4.5
-   app-text/docbook-xsl-stylesheets
-   dev-libs/libxslt:0
-   >=dev-util/intltool-0.50
-   dev-util/gperf
-   >=dev-util/patchelf-0.10
-   virtual/pkgconfig
-"
-COMMON_DEPEND="
-   >=sys-apps/util-linux-2.30
-"
-DEPEND="${COMMON_DEPEND}
-   >=sys-boot/gnu-efi-3.0.2
-   sys-libs/libcap
-"
-RDEPEND="${COMMON_DEPEND}
-   !sys-apps/systemd
-"
-
-S="${WORKDIR}/systemd-${PV}"
-
-PATCHES=(
-   "${FILESDIR}/237-libshared-static.patch"
-)
-
-src_configure() {
-   local emesonargs=(
-   -Dblkid=true
-   -Defi=true
-   -Dgnu-efi=true
-   -Defi-cc="$(tc-getCC)"
-   -Defi-ld="$(tc-getLD)"
-   -Dsplit-usr=true
-   -Drootprefix="${EPREFIX:-/}"
-
-   -Dacl=false
-   -Dapparmor=false
-   -Daudit=false
-   -Dbzip2=false
-   -Delfutils=false
-   -Dgcrypt=false
-   -Dgnutls=false
-   -Dkmod=false
-   -Dlibcryptsetup=false
-   -Dlibcurl=false
-   -Dlibidn=false
-   -Dlibidn2=false
-   -Dlibiptc=false
-   -Dlz4=false
-   -Dmicrohttpd=false
-   -Dpam=false
-   -Dqrencode=false
-   -Dseccomp=false
-   -Dselinux=false
-   -Dxkbcommon=false
-   -Dxz=false
-   )
-   meson_src_configure
-}
-
-set_efi_arch() {
-   case "$(tc-arch)" in
-   amd64) efi_arch=x64 ;;
-   arm)   efi_arch=arm ;;
-   arm64) efi_arch=aa64 ;;
-   x86)   efi_arch=x86 ;;
-   esac
-}
-
-src_compile() {
-   local efi_arch
-   set_efi_arch
-   local targets=(
-   bootctl
-   man/bootctl.1
-   man/kernel-install.8
-   src/boot/efi/linux${efi_arch}.efi.stub
-   src/boot/efi/systemd-boot${efi_arch}.efi
-   )
-   cd "${BUILD_DIR}" || die
-   eninja "${targets[@]}"
-   patchelf --remove-rpath bootctl || die
-}
-
-src_install() {
-   local efi_arch
-   set_efi_arch
-   dobin "${BUILD_DIR}"/bootctl src/kernel-install/kernel-install
-   doman "${BUILD_DIR}"/man/{bootctl.1,kernel-install.8}
-   exeinto usr/lib/kernel/install.d
-   doexe src/kernel-install/{50-depmod,90-loaderentry}.install
-   insinto usr/lib/systemd/boot/efi
-   doins

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2020-03-07 Thread Mike Gilbert 
commit: 55d446997eab87ecfb8ce170013dd25b704f0115
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Mar  8 04:03:21 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Mar  8 04:03:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55d44699

sys-boot/systemd-boot: bump to 245

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-boot/systemd-boot/Manifest|   1 +
 sys-boot/systemd-boot/systemd-boot-245.ebuild | 114 ++
 2 files changed, 115 insertions(+)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 2e301747f0b..c628b654e3c 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,2 +1,3 @@
 DIST systemd-241.tar.gz 7640538 BLAKE2B 
69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a
 SHA512 
a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e
 DIST systemd-243.tar.gz 8242522 BLAKE2B 
89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb
 SHA512 
56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
+DIST systemd-245.tar.gz 8993479 BLAKE2B 
be0b1fca5ba8585978f570868bc9135c1fee78ea64dcdf8b1a3419e856a83da90104ed2f86e5f3e5b0b6f29d4b34f603bfe1e4cbc61ccf71bedce547db62ff35
 SHA512 
1b80d0e02472dfc4197f11dab4f56cf90e8a6e105ce19f837cb11335b6d8577ed49031dad94cdb41aa9bdc06ec8eec62c8e9246272b83935e7bb9dcd3cd8c012

diff --git a/sys-boot/systemd-boot/systemd-boot-245.ebuild 
b/sys-boot/systemd-boot/systemd-boot-245.ebuild
new file mode 100644
index 000..df34ee3df7f
--- /dev/null
+++ b/sys-boot/systemd-boot/systemd-boot-245.ebuild
@@ -0,0 +1,114 @@
+# Copyright 2016-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson toolchain-funcs
+
+DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/;
+SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> 
systemd-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="test"
+
+BDEPEND="
+   app-text/docbook-xml-dtd:4.2
+   app-text/docbook-xml-dtd:4.5
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt:0
+   >=dev-util/intltool-0.50
+   dev-util/gperf
+   >=dev-util/patchelf-0.10
+   virtual/pkgconfig
+"
+COMMON_DEPEND="
+   >=sys-apps/util-linux-2.30
+"
+DEPEND="${COMMON_DEPEND}
+   >=sys-boot/gnu-efi-3.0.2
+   sys-libs/libcap
+"
+RDEPEND="${COMMON_DEPEND}
+   !sys-apps/systemd
+"
+
+S="${WORKDIR}/systemd-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/237-libshared-static.patch"
+)
+
+src_configure() {
+   local emesonargs=(
+   -Dblkid=true
+   -Defi=true
+   -Dgnu-efi=true
+   -Defi-cc="$(tc-getCC)"
+   -Defi-ld="$(tc-getLD)"
+   -Dsplit-usr=true
+   -Drootprefix="${EPREFIX:-/}"
+
+   -Dacl=false
+   -Dapparmor=false
+   -Daudit=false
+   -Dbzip2=false
+   -Delfutils=false
+   -Dgcrypt=false
+   -Dgnutls=false
+   -Dkmod=false
+   -Dlibcryptsetup=false
+   -Dlibcurl=false
+   -Dlibidn=false
+   -Dlibidn2=false
+   -Dlibiptc=false
+   -Dlz4=false
+   -Dmicrohttpd=false
+   -Dpam=false
+   -Dqrencode=false
+   -Dseccomp=false
+   -Dselinux=false
+   -Dxkbcommon=false
+   -Dxz=false
+   )
+   meson_src_configure
+}
+
+set_efi_arch() {
+   case "$(tc-arch)" in
+   amd64) efi_arch=x64 ;;
+   arm)   efi_arch=arm ;;
+   arm64) efi_arch=aa64 ;;
+   x86)   efi_arch=x86 ;;
+   esac
+}
+
+src_compile() {
+   local efi_arch
+   set_efi_arch
+   local targets=(
+   bootctl
+   man/bootctl.1
+   man/kernel-install.8
+   src/boot/efi/linux${efi_arch}.efi.stub
+   src/boot/efi/systemd-boot${efi_arch}.efi
+   )
+   cd "${BUILD_DIR}" || die
+   eninja "${targets[@]}"
+   patchelf --remove-rpath bootctl || die
+}
+
+src_install() {
+   local efi_arch
+   set_efi_arch
+   dobin "${BUILD_DIR}"/bootctl src/kernel-install/kernel-install
+   doman "${BUILD_DIR}"/man/{bootctl.1,kernel-install.8}
+   exeinto usr/lib/kernel/install.d
+   doexe src/kernel-install/{50-depmod,90-loaderentry}.install
+   insinto usr/lib/systemd/boot/efi
+   doins

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/files/

2019-09-28 Thread Mike Gilbert 
commit: 407828fc0139a3e9f177f475bab9e540cac76d3e
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sat Sep 28 07:44:40 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Sep 29 02:43:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=407828fc

sys-boot/systemd-boot: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/13068
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-boot/systemd-boot/files/239-debug-extra.patch |  40 
 sys-boot/systemd-boot/files/239-stat-0.patch  | 108 --
 sys-boot/systemd-boot/files/239-stat-1.patch  |  74 ---
 3 files changed, 222 deletions(-)

diff --git a/sys-boot/systemd-boot/files/239-debug-extra.patch 
b/sys-boot/systemd-boot/files/239-debug-extra.patch
deleted file mode 100644
index 19db590257c..000
--- a/sys-boot/systemd-boot/files/239-debug-extra.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8f6b442a78d0b485f044742ad90b2e8271b4e68e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
-Date: Sun, 19 Aug 2018 19:11:30 +0200
-Subject: [PATCH] meson: rename -Ddebug to -Ddebug-extra
-
-Meson added -Doptimization and -Ddebug options, which obviously causes
-a conflict with our -Ddebug options. Let's rename it.
-
-Fixes #9883.

- meson.build   | 2 +-
- meson_options.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index f79ac4b12e7..2209c935ad6 100644
 a/meson.build
-+++ b/meson.build
-@@ -763,7 +763,7 @@ substs.set('DEBUGTTY', get_option('debug-tty'))
- 
- enable_debug_hashmap = false
- enable_debug_mmap_cache = false
--foreach name : get_option('debug')
-+foreach name : get_option('debug-extra')
- if name == 'hashmap'
- enable_debug_hashmap = true
- elif name == 'mmap-cache'
-diff --git a/meson_options.txt b/meson_options.txt
-index e3140c8c110..7b1f61bf464 100644
 a/meson_options.txt
-+++ b/meson_options.txt
-@@ -45,7 +45,7 @@ option('debug-shell', type : 'string', value : '/bin/sh',
-description : 'path to debug shell binary')
- option('debug-tty', type : 'string', value : '/dev/tty9',
-description : 'specify the tty device for debug shell')
--option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : 
[],
-+option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], 
value : [],
-description : 'enable extra debugging')
- option('memory-accounting-default', type : 'boolean',
-description : 'enable MemoryAccounting= by default')

diff --git a/sys-boot/systemd-boot/files/239-stat-0.patch 
b/sys-boot/systemd-boot/files/239-stat-0.patch
deleted file mode 100644
index e136b703a2f..000
--- a/sys-boot/systemd-boot/files/239-stat-0.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 75720bff62a84896e9a0654afc7cf9408cf89a38 Mon Sep 17 00:00:00 2001
-From: Filipe Brandenburger 
-Date: Sun, 15 Jul 2018 22:43:35 -0700
-Subject: [PATCH] build-sys: Detect whether struct statx is defined in
- sys/stat.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Starting with glibc 2.27.9000-36.fc29, include file sys/stat.h will have a
-definition for struct statx, in which case include file linux/stat.h should be
-avoided, in order to prevent a duplicate definition.
-
-In file included from ../src/basic/missing.h:18,
-from ../src/basic/util.h:28,
-from ../src/basic/hashmap.h:10,
-from ../src/shared/bus-util.h:12,
-from ../src/libsystemd/sd-bus/bus-creds.c:11:
-/usr/include/linux/stat.h:99:8: error: redefinition of ‘struct statx’
- struct statx {
-   ^
-In file included from /usr/include/sys/stat.h:446,
-from ../src/basic/util.h:19,
-from ../src/basic/hashmap.h:10,
-from ../src/shared/bus-util.h:12,
-from ../src/libsystemd/sd-bus/bus-creds.c:11:
-/usr/include/bits/statx.h:36:8: note: originally defined here
- struct statx
-   ^
-
-Extend our meson.build to look for struct statx when only sys/stat.h is
-included and, in that case, do not include linux/stat.h anymore.
-
-Tested that systemd builds correctly when using a glibc version that includes a
-definition for struct statx.
-
-glibc Fedora RPM update:
-https://src.fedoraproject.org/rpms/glibc/c/28cb5d31fc1e5887912283c889689c47076278ae
-
-glibc upstream commit:
-https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=fd70af45528d59a00eb3190ef6706cb299488fcd

- meson.build| 5 +
- src/basic/missing.h| 5 -
- src/basic/xattr-util.c | 1 -
- 3 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index dd904c7148..68423bdfa5 100644
 a/meson.build
-+++ b/meson.build
-@@

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2019-09-11 Thread Mike Gilbert 
commit: 478767238f1dfc7eae9b913981baa4a1987c6f14
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Sep 11 23:37:41 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Sep 11 23:38:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47876723

sys-boot/systemd-boot: bump to 243

Package-Manager: Portage-2.3.75_p7, Repoman-2.3.17_p49
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-boot/systemd-boot/Manifest|   1 +
 sys-boot/systemd-boot/systemd-boot-243.ebuild | 114 ++
 2 files changed, 115 insertions(+)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index a73bcfb7563..ea820109077 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,2 +1,3 @@
 DIST systemd-239.tar.gz 7157293 BLAKE2B 
975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0
 SHA512 
fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
 DIST systemd-241.tar.gz 7640538 BLAKE2B 
69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a
 SHA512 
a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e
+DIST systemd-243.tar.gz 8242522 BLAKE2B 
89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb
 SHA512 
56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e

diff --git a/sys-boot/systemd-boot/systemd-boot-243.ebuild 
b/sys-boot/systemd-boot/systemd-boot-243.ebuild
new file mode 100644
index 000..99dbbaa4668
--- /dev/null
+++ b/sys-boot/systemd-boot/systemd-boot-243.ebuild
@@ -0,0 +1,114 @@
+# Copyright 2016-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson toolchain-funcs
+
+DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/;
+SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> 
systemd-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="test"
+
+BDEPEND="
+   app-text/docbook-xml-dtd:4.2
+   app-text/docbook-xml-dtd:4.5
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt:0
+   >=dev-util/intltool-0.50
+   dev-util/gperf
+   >=dev-util/patchelf-0.10
+   virtual/pkgconfig
+"
+COMMON_DEPEND="
+   >=sys-apps/util-linux-2.30
+"
+DEPEND="${COMMON_DEPEND}
+   >=sys-boot/gnu-efi-3.0.2
+   sys-libs/libcap
+"
+RDEPEND="${COMMON_DEPEND}
+   !sys-apps/systemd
+"
+
+S="${WORKDIR}/systemd-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/237-libshared-static.patch"
+)
+
+src_configure() {
+   local emesonargs=(
+   -Dblkid=true
+   -Defi=true
+   -Dgnu-efi=true
+   -Defi-cc="$(tc-getCC)"
+   -Defi-ld="$(tc-getLD)"
+   -Dsplit-usr=true
+   -Drootprefix="${EPREFIX:-/}"
+
+   -Dacl=false
+   -Dapparmor=false
+   -Daudit=false
+   -Dbzip2=false
+   -Delfutils=false
+   -Dgcrypt=false
+   -Dgnutls=false
+   -Dkmod=false
+   -Dlibcryptsetup=false
+   -Dlibcurl=false
+   -Dlibidn=false
+   -Dlibidn2=false
+   -Dlibiptc=false
+   -Dlz4=false
+   -Dmicrohttpd=false
+   -Dpam=false
+   -Dqrencode=false
+   -Dseccomp=false
+   -Dselinux=false
+   -Dxkbcommon=false
+   -Dxz=false
+   )
+   meson_src_configure
+}
+
+set_efi_arch() {
+   case "$(tc-arch)" in
+   amd64) efi_arch=x64 ;;
+   arm)   efi_arch=arm ;;
+   arm64) efi_arch=aa64 ;;
+   x86)   efi_arch=x86 ;;
+   esac
+}
+
+src_compile() {
+   local efi_arch
+   set_efi_arch
+   local targets=(
+   bootctl
+   man/bootctl.1
+   man/kernel-install.8
+   src/boot/efi/linux${efi_arch}.efi.stub
+   src/boot/efi/systemd-boot${efi_arch}.efi
+   )
+   cd "${BUILD_DIR}" || die
+   eninja "${targets[@]}"
+   patchelf --remove-rpath bootctl || die
+}
+
+src_install() {
+   local efi_arch
+   set_efi_arch
+   dobin "${BUILD_DIR}"/bootctl src/kernel-install/kernel-install
+   doman "${BUILD_DIR}"/man/{bootctl.1,kernel-install.8}
+   exeinto usr/lib/kernel/install.d
+   doexe src/kernel-install/{50-depmod,90-loaderentry}.install
+   insinto

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2019-09-11 Thread Mike Gilbert 
commit: 35e5903e702ca43e721daab24ced0096273d32ce
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Sep 11 23:38:11 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Sep 11 23:38:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35e5903e

sys-boot/systemd-boot: remove old

Package-Manager: Portage-2.3.75_p7, Repoman-2.3.17_p49
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-boot/systemd-boot/Manifest|   1 -
 sys-boot/systemd-boot/systemd-boot-239.ebuild | 113 --
 2 files changed, 114 deletions(-)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index ea820109077..2e301747f0b 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,3 +1,2 @@
-DIST systemd-239.tar.gz 7157293 BLAKE2B 
975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0
 SHA512 
fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
 DIST systemd-241.tar.gz 7640538 BLAKE2B 
69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a
 SHA512 
a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e
 DIST systemd-243.tar.gz 8242522 BLAKE2B 
89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb
 SHA512 
56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e

diff --git a/sys-boot/systemd-boot/systemd-boot-239.ebuild 
b/sys-boot/systemd-boot/systemd-boot-239.ebuild
deleted file mode 100644
index 603415b39a0..000
--- a/sys-boot/systemd-boot/systemd-boot-239.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson toolchain-funcs
-
-DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/;
-SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> 
systemd-${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="test"
-
-COMMON_DEPEND="
-   >=sys-apps/util-linux-2.30
-"
-DEPEND="${COMMON_DEPEND}
-   app-text/docbook-xml-dtd:4.2
-   app-text/docbook-xml-dtd:4.5
-   app-text/docbook-xsl-stylesheets
-   dev-libs/libxslt:0
-   >=dev-util/intltool-0.50
-   dev-util/gperf
-   >=sys-boot/gnu-efi-3.0.2
-   sys-libs/libcap
-   virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-   !sys-apps/systemd
-"
-
-S="${WORKDIR}/systemd-${PV}"
-
-PATCHES=(
-   "${FILESDIR}/237-libshared-static.patch"
-   "${FILESDIR}/239-debug-extra.patch"
-   "${FILESDIR}/239-stat-0.patch"
-   "${FILESDIR}/239-stat-1.patch"
-)
-
-src_configure() {
-   local emesonargs=(
-   -D blkid=true
-   -D efi=true
-   -D gnu-efi=true
-   -D efi-cc="$(tc-getCC)"
-   -D efi-ld="$(tc-getLD)"
-   -D split-usr=true
-   -D rootprefix="${EPREFIX:-/}"
-
-   -D acl=false
-   -D apparmor=false
-   -D audit=false
-   -D bzip2=false
-   -D elfutils=false
-   -D gcrypt=false
-   -D gnutls=false
-   -D kmod=false
-   -D libcryptsetup=false
-   -D libcurl=false
-   -D libidn=false
-   -D libidn2=false
-   -D libiptc=false
-   -D lz4=false
-   -D microhttpd=false
-   -D myhostname=false
-   -D pam=false
-   -D qrencode=false
-   -D seccomp=false
-   -D selinux=false
-   -D xkbcommon=false
-   -D xz=false
-   )
-   meson_src_configure
-}
-
-set_efi_arch() {
-   case "$(tc-arch)" in
-   amd64) efi_arch=x64 ;;
-   arm)   efi_arch=arm ;;
-   arm64) efi_arch=aa64 ;;
-   x86)   efi_arch=x86 ;;
-   esac
-}
-
-src_compile() {
-   local efi_arch
-   set_efi_arch
-   local targets=(
-   bootctl
-   man/bootctl.1
-   man/kernel-install.8
-   src/boot/efi/linux${efi_arch}.efi.stub
-   src/boot/efi/systemd-boot${efi_arch}.efi
-   )
-   eninja -C "${BUILD_DIR}" "${targets[@]}" || die
-}
-
-src_install() {
-   local efi_arch
-   set_efi_arch
-   dobin "${BUILD_DIR}"/bootctl src/kernel-install/kernel-install
-   doman "${BUILD_DIR}"/man/{bootctl.1,kernel-install.8}
-   exeinto usr/lib/kernel/install.d
-   doexe

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2019-04-09 Thread Mike Gilbert 
commit: 4e698ca0533f21e9666dc5e21249054a1593497f
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Apr  9 16:29:19 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Apr  9 16:29:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e698ca0

sys-boot/systemd-boot: require >=dev-util/patchelf-0.10

Closes: https://bugs.gentoo.org/682908
Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-boot/systemd-boot/systemd-boot-241.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sys-boot/systemd-boot/systemd-boot-241.ebuild 
b/sys-boot/systemd-boot/systemd-boot-241.ebuild
index f30a1842698..99dbbaa4668 100644
--- a/sys-boot/systemd-boot/systemd-boot-241.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-241.ebuild
@@ -22,7 +22,7 @@ BDEPEND="
dev-libs/libxslt:0
>=dev-util/intltool-0.50
dev-util/gperf
-   dev-util/patchelf
+   >=dev-util/patchelf-0.10
virtual/pkgconfig
 "
 COMMON_DEPEND="
@@ -67,7 +67,6 @@ src_configure() {
-Dlibiptc=false
-Dlz4=false
-Dmicrohttpd=false
-   -Dmyhostname=false
-Dpam=false
-Dqrencode=false
-Dseccomp=false

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2019-03-31 Thread Mike Gilbert 
commit: f42ae25d51500bd1c11e69c8003159f555d0e387
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Mar 31 16:49:44 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Mar 31 16:49:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f42ae25d

sys-boot/systemd-boot: remove bogus RPATH

Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-boot/systemd-boot/systemd-boot-241.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys-boot/systemd-boot/systemd-boot-241.ebuild 
b/sys-boot/systemd-boot/systemd-boot-241.ebuild
index fd87a5e7a12..f30a1842698 100644
--- a/sys-boot/systemd-boot/systemd-boot-241.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-241.ebuild
@@ -22,6 +22,7 @@ BDEPEND="
dev-libs/libxslt:0
>=dev-util/intltool-0.50
dev-util/gperf
+   dev-util/patchelf
virtual/pkgconfig
 "
 COMMON_DEPEND="
@@ -96,7 +97,9 @@ src_compile() {
src/boot/efi/linux${efi_arch}.efi.stub
src/boot/efi/systemd-boot${efi_arch}.efi
)
-   eninja -C "${BUILD_DIR}" "${targets[@]}" || die
+   cd "${BUILD_DIR}" || die
+   eninja "${targets[@]}"
+   patchelf --remove-rpath bootctl || die
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/files/, sys-boot/systemd-boot/

2019-03-31 Thread Mike Gilbert 
commit: cd7fdd79aaea10bf089059344681d49f86599973
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Mar 31 16:23:48 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Mar 31 16:41:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd7fdd79

sys-boot/systemd-boot: remove old

Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-boot/systemd-boot/Manifest |   3 -
 .../233-Force-libsystemd-shared-to-be-static.patch |  25 -
 .../systemd-boot/files/235-libshared-static.patch  |  24 -
 sys-boot/systemd-boot/systemd-boot-233.ebuild  | 111 -
 sys-boot/systemd-boot/systemd-boot-235.ebuild  | 108 
 sys-boot/systemd-boot/systemd-boot-237.ebuild  | 110 
 6 files changed, 381 deletions(-)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 7270e8b5f4a..7948d4c26aa 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,4 +1 @@
-DIST systemd-233.tar.gz 4660737 BLAKE2B 
38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2
 SHA512 
5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
-DIST systemd-235.tar.gz 6586406 BLAKE2B 
f2e46a6c51fc9445800c4b7eee66f23ae83b42c2fedf2304acf612e6cb99122afe67f1b93cf72ed022b52384975afb92ab38cfb4efc6026384602c973d2eb98e
 SHA512 
243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993
-DIST systemd-237.tar.gz 6871350 BLAKE2B 
4734a110a297fbbd6679bced6302fcdca55ab5d4207905e8dee9f5545f1de841d5adeaa4fd89961b9e63709d04b5c862b8bc81481311cf8e72ee327e459c9d91
 SHA512 
15ef4b92815a6dd9a6c51672dbc00fd7cd0f08068ef0cbeaca574f68d330b28bc67ba1946f24f75ef3d9e7b63843a73eea700db54688061dbf5c9f8470394c3b
 DIST systemd-239.tar.gz 7157293 BLAKE2B 
975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0
 SHA512 
fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f

diff --git 
a/sys-boot/systemd-boot/files/233-Force-libsystemd-shared-to-be-static.patch 
b/sys-boot/systemd-boot/files/233-Force-libsystemd-shared-to-be-static.patch
deleted file mode 100644
index b837890f616..000
--- a/sys-boot/systemd-boot/files/233-Force-libsystemd-shared-to-be-static.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5aefd5fddd2af5f979ece96cda8ed1ab0492709c Mon Sep 17 00:00:00 2001
-From: Mike Gilbert 
-Date: Tue, 30 May 2017 14:05:41 -0400
-Subject: [PATCH] Force libsystemd-shared to be static
-

- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 2a5610740..4e95cb316 100644
 a/Makefile.am
-+++ b/Makefile.am
-@@ -1145,7 +1145,7 @@ libshared_la_LIBADD = \
-   $(BLKID_LIBS) \
-   $(LIBCRYPTSETUP_LIBS)
- 
--rootlibexec_LTLIBRARIES += \
-+noinst_LTLIBRARIES += \
-   libsystemd-shared.la
- 
- libsystemd_shared_la_SOURCES = \
--- 
-2.13.0
-

diff --git a/sys-boot/systemd-boot/files/235-libshared-static.patch 
b/sys-boot/systemd-boot/files/235-libshared-static.patch
deleted file mode 100644
index 2a0bf678539..000
--- a/sys-boot/systemd-boot/files/235-libshared-static.patch
+++ /dev/null
@@ -1,24 +0,0 @@
 a/meson.build
-+++ b/meson.build
-@@ -1505,9 +1505,8 @@ if conf.get('ENABLE_EFI') == 1 and 
conf.get('HAVE_BLKID') == 1
- exe = executable('bootctl',
-  'src/boot/bootctl.c',
-  include_directories : includes,
-- link_with : [libshared],
-+ link_with : [libshared_static],
-  dependencies : [libblkid],
-- install_rpath : rootlibexecdir,
-  install : true)
- public_programs += [exe]
- endif
-diff --git a/src/shared/meson.build b/src/shared/meson.build
-index 883821352..b560e65c9 100644
 a/src/shared/meson.build
-+++ b/src/shared/meson.build
-@@ -157,5 +157,6 @@ libshared_static = static_library(
- libshared_name,
- shared_sources,
- basic_sources,
-+libsystemd_internal_sources,
- include_directories : includes,
- dependencies : libshared_deps)

diff --git a/sys-boot/systemd-boot/systemd-boot-233.ebuild 
b/sys-boot/systemd-boot/systemd-boot-233.ebuild
deleted file mode 100644
index 313b919e089..000
--- a/sys-boot/systemd-boot/systemd-boot-233.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="UEFI boot manager from

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2019-03-31 Thread Mike Gilbert 
commit: a847abc79af33ad20ca038e708d35760175a2f35
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Mar 31 16:40:49 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Mar 31 16:41:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a847abc7

sys-boot/systemd-boot: bump to 241

Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-boot/systemd-boot/Manifest|   1 +
 sys-boot/systemd-boot/systemd-boot-241.ebuild | 112 ++
 2 files changed, 113 insertions(+)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 7948d4c26aa..a73bcfb7563 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1 +1,2 @@
 DIST systemd-239.tar.gz 7157293 BLAKE2B 
975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0
 SHA512 
fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
+DIST systemd-241.tar.gz 7640538 BLAKE2B 
69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a
 SHA512 
a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e

diff --git a/sys-boot/systemd-boot/systemd-boot-241.ebuild 
b/sys-boot/systemd-boot/systemd-boot-241.ebuild
new file mode 100644
index 000..fd87a5e7a12
--- /dev/null
+++ b/sys-boot/systemd-boot/systemd-boot-241.ebuild
@@ -0,0 +1,112 @@
+# Copyright 2016-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson toolchain-funcs
+
+DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/;
+SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> 
systemd-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="test"
+
+BDEPEND="
+   app-text/docbook-xml-dtd:4.2
+   app-text/docbook-xml-dtd:4.5
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt:0
+   >=dev-util/intltool-0.50
+   dev-util/gperf
+   virtual/pkgconfig
+"
+COMMON_DEPEND="
+   >=sys-apps/util-linux-2.30
+"
+DEPEND="${COMMON_DEPEND}
+   >=sys-boot/gnu-efi-3.0.2
+   sys-libs/libcap
+"
+RDEPEND="${COMMON_DEPEND}
+   !sys-apps/systemd
+"
+
+S="${WORKDIR}/systemd-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/237-libshared-static.patch"
+)
+
+src_configure() {
+   local emesonargs=(
+   -Dblkid=true
+   -Defi=true
+   -Dgnu-efi=true
+   -Defi-cc="$(tc-getCC)"
+   -Defi-ld="$(tc-getLD)"
+   -Dsplit-usr=true
+   -Drootprefix="${EPREFIX:-/}"
+
+   -Dacl=false
+   -Dapparmor=false
+   -Daudit=false
+   -Dbzip2=false
+   -Delfutils=false
+   -Dgcrypt=false
+   -Dgnutls=false
+   -Dkmod=false
+   -Dlibcryptsetup=false
+   -Dlibcurl=false
+   -Dlibidn=false
+   -Dlibidn2=false
+   -Dlibiptc=false
+   -Dlz4=false
+   -Dmicrohttpd=false
+   -Dmyhostname=false
+   -Dpam=false
+   -Dqrencode=false
+   -Dseccomp=false
+   -Dselinux=false
+   -Dxkbcommon=false
+   -Dxz=false
+   )
+   meson_src_configure
+}
+
+set_efi_arch() {
+   case "$(tc-arch)" in
+   amd64) efi_arch=x64 ;;
+   arm)   efi_arch=arm ;;
+   arm64) efi_arch=aa64 ;;
+   x86)   efi_arch=x86 ;;
+   esac
+}
+
+src_compile() {
+   local efi_arch
+   set_efi_arch
+   local targets=(
+   bootctl
+   man/bootctl.1
+   man/kernel-install.8
+   src/boot/efi/linux${efi_arch}.efi.stub
+   src/boot/efi/systemd-boot${efi_arch}.efi
+   )
+   eninja -C "${BUILD_DIR}" "${targets[@]}" || die
+}
+
+src_install() {
+   local efi_arch
+   set_efi_arch
+   dobin "${BUILD_DIR}"/bootctl src/kernel-install/kernel-install
+   doman "${BUILD_DIR}"/man/{bootctl.1,kernel-install.8}
+   exeinto usr/lib/kernel/install.d
+   doexe src/kernel-install/{50-depmod,90-loaderentry}.install
+   insinto usr/lib/systemd/boot/efi
+   doins 
"${BUILD_DIR}"/src/boot/efi/{linux${efi_arch}.efi.stub,systemd-boot${efi_arch}.efi}
+   einstalldocs
+}

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/files/, sys-boot/systemd-boot/

2018-10-29 Thread Mike Gilbert 
commit: 6713479f9affb2b5e2231d135219c16ce3f03778
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Oct 29 03:01:49 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Oct 30 01:15:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6713479f

sys-boot/systemd-boot: glibc-2.28 compat for stat.h

Closes: https://bugs.gentoo.org/669846
Package-Manager: Portage-2.3.51_p2, Repoman-2.3.11_p27
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-boot/systemd-boot/files/239-stat-0.patch  | 108 ++
 sys-boot/systemd-boot/files/239-stat-1.patch  |  74 ++
 sys-boot/systemd-boot/systemd-boot-239.ebuild |   2 +
 3 files changed, 184 insertions(+)

diff --git a/sys-boot/systemd-boot/files/239-stat-0.patch 
b/sys-boot/systemd-boot/files/239-stat-0.patch
new file mode 100644
index 000..e136b703a2f
--- /dev/null
+++ b/sys-boot/systemd-boot/files/239-stat-0.patch
@@ -0,0 +1,108 @@
+From 75720bff62a84896e9a0654afc7cf9408cf89a38 Mon Sep 17 00:00:00 2001
+From: Filipe Brandenburger 
+Date: Sun, 15 Jul 2018 22:43:35 -0700
+Subject: [PATCH] build-sys: Detect whether struct statx is defined in
+ sys/stat.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Starting with glibc 2.27.9000-36.fc29, include file sys/stat.h will have a
+definition for struct statx, in which case include file linux/stat.h should be
+avoided, in order to prevent a duplicate definition.
+
+In file included from ../src/basic/missing.h:18,
+from ../src/basic/util.h:28,
+from ../src/basic/hashmap.h:10,
+from ../src/shared/bus-util.h:12,
+from ../src/libsystemd/sd-bus/bus-creds.c:11:
+/usr/include/linux/stat.h:99:8: error: redefinition of ‘struct statx’
+ struct statx {
+   ^
+In file included from /usr/include/sys/stat.h:446,
+from ../src/basic/util.h:19,
+from ../src/basic/hashmap.h:10,
+from ../src/shared/bus-util.h:12,
+from ../src/libsystemd/sd-bus/bus-creds.c:11:
+/usr/include/bits/statx.h:36:8: note: originally defined here
+ struct statx
+   ^
+
+Extend our meson.build to look for struct statx when only sys/stat.h is
+included and, in that case, do not include linux/stat.h anymore.
+
+Tested that systemd builds correctly when using a glibc version that includes a
+definition for struct statx.
+
+glibc Fedora RPM update:
+https://src.fedoraproject.org/rpms/glibc/c/28cb5d31fc1e5887912283c889689c47076278ae
+
+glibc upstream commit:
+https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=fd70af45528d59a00eb3190ef6706cb299488fcd
+---
+ meson.build| 5 +
+ src/basic/missing.h| 5 -
+ src/basic/xattr-util.c | 1 -
+ 3 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index dd904c7148..68423bdfa5 100644
+--- a/meson.build
 b/meson.build
+@@ -425,6 +425,7 @@ decl_headers = '''
+ #include 
+ '''
+ # FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail
++# FIXME: these should use -D_GNU_SOURCE, since that is defined at build time
+ 
+ foreach decl : ['char16_t',
+ 'char32_t',
+@@ -439,6 +440,10 @@ foreach decl : ['char16_t',
+ conf.set10('HAVE_' + decl.underscorify().to_upper(), have)
+ endforeach
+ 
++conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', 
prefix : '''
++#include 
++''', args : '-D_GNU_SOURCE') > 0)
++
+ foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'],
+ ['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'],
+ ['IFLA_VRF_TABLE',   'linux/if_link.h'],
+diff --git a/src/basic/missing.h b/src/basic/missing.h
+index 71a07d0574..14ad3d4914 100644
+--- a/src/basic/missing.h
 b/src/basic/missing.h
+@@ -15,7 +15,6 @@
+ #include 
+ #include 
+ #include 
+-#include 
+ #include 
+ #include 
+ #include 
+@@ -25,6 +24,10 @@
+ #include 
+ #include 
+ 
++#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H
++#include 
++#endif
++
+ #if HAVE_AUDIT
+ #include 
+ #endif
+diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c
+index c5c55ea846..0ee0979837 100644
+--- a/src/basic/xattr-util.c
 b/src/basic/xattr-util.c
+@@ -2,7 +2,6 @@
+ 
+ #include 
+ #include 
+-#include 
+ #include 
+ #include 
+ #include 
+-- 
+2.19.1
+

diff --git a/sys-boot/systemd-boot/files/239-stat-1.patch 
b/sys-boot/systemd-boot/files/239-stat-1.patch
new file mode 100644
index 000..1104de3c9c1
--- /dev/null
+++ b/sys-boot/systemd-boot/files/239-stat-1.patch
@@ -0,0 +1,74 @@
+From 9c869d08d82c73f62ab3527567858ce4b0cf1257 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
+Date: Wed, 18 Jul 2018 17:26:17 +0200
+Subject: [PATCH] meson: unify linux/stat.h check with other checks and use
+ _GNU_SOURCE
+
+Using _GNU_SOURCE

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/, sys-boot/systemd-boot/files/

2018-10-02 Thread Mike Gilbert 
commit: 1a94fdfff13237475b08c75461ea5b2c55a8796d
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Oct  2 15:41:11 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Oct  2 15:41:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a94fdff

sys-boot/systemd-boot: rename debug meson option

Closes: https://bugs.gentoo.org/667582
Package-Manager: Portage-2.3.50_p10, Repoman-2.3.11_p17
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-boot/systemd-boot/files/239-debug-extra.patch | 40 +++
 sys-boot/systemd-boot/systemd-boot-239.ebuild |  3 +-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/sys-boot/systemd-boot/files/239-debug-extra.patch 
b/sys-boot/systemd-boot/files/239-debug-extra.patch
new file mode 100644
index 000..19db590257c
--- /dev/null
+++ b/sys-boot/systemd-boot/files/239-debug-extra.patch
@@ -0,0 +1,40 @@
+From 8f6b442a78d0b485f044742ad90b2e8271b4e68e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
+Date: Sun, 19 Aug 2018 19:11:30 +0200
+Subject: [PATCH] meson: rename -Ddebug to -Ddebug-extra
+
+Meson added -Doptimization and -Ddebug options, which obviously causes
+a conflict with our -Ddebug options. Let's rename it.
+
+Fixes #9883.
+---
+ meson.build   | 2 +-
+ meson_options.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index f79ac4b12e7..2209c935ad6 100644
+--- a/meson.build
 b/meson.build
+@@ -763,7 +763,7 @@ substs.set('DEBUGTTY', get_option('debug-tty'))
+ 
+ enable_debug_hashmap = false
+ enable_debug_mmap_cache = false
+-foreach name : get_option('debug')
++foreach name : get_option('debug-extra')
+ if name == 'hashmap'
+ enable_debug_hashmap = true
+ elif name == 'mmap-cache'
+diff --git a/meson_options.txt b/meson_options.txt
+index e3140c8c110..7b1f61bf464 100644
+--- a/meson_options.txt
 b/meson_options.txt
+@@ -45,7 +45,7 @@ option('debug-shell', type : 'string', value : '/bin/sh',
+description : 'path to debug shell binary')
+ option('debug-tty', type : 'string', value : '/dev/tty9',
+description : 'specify the tty device for debug shell')
+-option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : 
[],
++option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], 
value : [],
+description : 'enable extra debugging')
+ option('memory-accounting-default', type : 'boolean',
+description : 'enable MemoryAccounting= by default')

diff --git a/sys-boot/systemd-boot/systemd-boot-239.ebuild 
b/sys-boot/systemd-boot/systemd-boot-239.ebuild
index 48d61ac38b2..4eb8570b73c 100644
--- a/sys-boot/systemd-boot/systemd-boot-239.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-239.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
@@ -37,6 +37,7 @@ S="${WORKDIR}/systemd-${PV}"
 
 PATCHES=(
"${FILESDIR}/237-libshared-static.patch"
+   "${FILESDIR}/239-debug-extra.patch"
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2018-07-01 Thread Mike Gilbert 
commit: e96a13e6ede76d46518d71e4644c210c0e394612
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Jul  1 13:52:38 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Jul  1 13:52:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e96a13e6

sys-boot/systemd-boot: bump to 239

Package-Manager: Portage-2.3.40_p15, Repoman-2.3.9_p247

 sys-boot/systemd-boot/Manifest|   1 +
 sys-boot/systemd-boot/systemd-boot-239.ebuild | 110 ++
 2 files changed, 111 insertions(+)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 04a2c669219..7270e8b5f4a 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,3 +1,4 @@
 DIST systemd-233.tar.gz 4660737 BLAKE2B 
38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2
 SHA512 
5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
 DIST systemd-235.tar.gz 6586406 BLAKE2B 
f2e46a6c51fc9445800c4b7eee66f23ae83b42c2fedf2304acf612e6cb99122afe67f1b93cf72ed022b52384975afb92ab38cfb4efc6026384602c973d2eb98e
 SHA512 
243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993
 DIST systemd-237.tar.gz 6871350 BLAKE2B 
4734a110a297fbbd6679bced6302fcdca55ab5d4207905e8dee9f5545f1de841d5adeaa4fd89961b9e63709d04b5c862b8bc81481311cf8e72ee327e459c9d91
 SHA512 
15ef4b92815a6dd9a6c51672dbc00fd7cd0f08068ef0cbeaca574f68d330b28bc67ba1946f24f75ef3d9e7b63843a73eea700db54688061dbf5c9f8470394c3b
+DIST systemd-239.tar.gz 7157293 BLAKE2B 
975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0
 SHA512 
fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f

diff --git a/sys-boot/systemd-boot/systemd-boot-239.ebuild 
b/sys-boot/systemd-boot/systemd-boot-239.ebuild
new file mode 100644
index 000..48d61ac38b2
--- /dev/null
+++ b/sys-boot/systemd-boot/systemd-boot-239.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson toolchain-funcs
+
+DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/;
+SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> 
systemd-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="test"
+
+COMMON_DEPEND="
+   >=sys-apps/util-linux-2.30
+"
+DEPEND="${COMMON_DEPEND}
+   app-text/docbook-xml-dtd:4.2
+   app-text/docbook-xml-dtd:4.5
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt:0
+   >=dev-util/intltool-0.50
+   dev-util/gperf
+   >=sys-boot/gnu-efi-3.0.2
+   sys-libs/libcap
+   virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+   !sys-apps/systemd
+"
+
+S="${WORKDIR}/systemd-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/237-libshared-static.patch"
+)
+
+src_configure() {
+   local emesonargs=(
+   -D blkid=true
+   -D efi=true
+   -D gnu-efi=true
+   -D efi-cc="$(tc-getCC)"
+   -D efi-ld="$(tc-getLD)"
+   -D split-usr=true
+   -D rootprefix="${EPREFIX:-/}"
+
+   -D acl=false
+   -D apparmor=false
+   -D audit=false
+   -D bzip2=false
+   -D elfutils=false
+   -D gcrypt=false
+   -D gnutls=false
+   -D kmod=false
+   -D libcryptsetup=false
+   -D libcurl=false
+   -D libidn=false
+   -D libidn2=false
+   -D libiptc=false
+   -D lz4=false
+   -D microhttpd=false
+   -D myhostname=false
+   -D pam=false
+   -D qrencode=false
+   -D seccomp=false
+   -D selinux=false
+   -D xkbcommon=false
+   -D xz=false
+   )
+   meson_src_configure
+}
+
+set_efi_arch() {
+   case "$(tc-arch)" in
+   amd64) efi_arch=x64 ;;
+   arm)   efi_arch=arm ;;
+   arm64) efi_arch=aa64 ;;
+   x86)   efi_arch=x86 ;;
+   esac
+}
+
+src_compile() {
+   local efi_arch
+   set_efi_arch
+   local targets=(
+   bootctl
+   man/bootctl.1
+   man/kernel-install.8
+   src/boot/efi/linux${efi_arch}.efi.stub
+   src/boot/efi/systemd-boot${efi_arch}.efi
+   )
+   eninja -C "${BUILD_DIR}" "${targets[@]}" || die
+}
+
+src_install() {
+   local efi_arch
+   set_efi_arch
+   dobin "${BUILD_DIR}"/bootctl

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/, sys-boot/systemd-boot/files/

2018-02-12 Thread Mike Gilbert 
commit: 06d369db6410ed60d7739fe8f8737da338a173e4
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Feb 12 16:54:49 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Feb 12 16:55:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06d369db

sys-boot/systemd-boot: bump to 237

Closes: https://bugs.gentoo.org/647316
Package-Manager: Portage-2.3.24_p18, Repoman-2.3.6_p99

 sys-boot/systemd-boot/Manifest |   1 +
 .../systemd-boot/files/237-libshared-static.patch  |  15 +++
 sys-boot/systemd-boot/systemd-boot-237.ebuild  | 110 +
 3 files changed, 126 insertions(+)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 8e5e9a536b2..04a2c669219 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,2 +1,3 @@
 DIST systemd-233.tar.gz 4660737 BLAKE2B 
38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2
 SHA512 
5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
 DIST systemd-235.tar.gz 6586406 BLAKE2B 
f2e46a6c51fc9445800c4b7eee66f23ae83b42c2fedf2304acf612e6cb99122afe67f1b93cf72ed022b52384975afb92ab38cfb4efc6026384602c973d2eb98e
 SHA512 
243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993
+DIST systemd-237.tar.gz 6871350 BLAKE2B 
4734a110a297fbbd6679bced6302fcdca55ab5d4207905e8dee9f5545f1de841d5adeaa4fd89961b9e63709d04b5c862b8bc81481311cf8e72ee327e459c9d91
 SHA512 
15ef4b92815a6dd9a6c51672dbc00fd7cd0f08068ef0cbeaca574f68d330b28bc67ba1946f24f75ef3d9e7b63843a73eea700db54688061dbf5c9f8470394c3b

diff --git a/sys-boot/systemd-boot/files/237-libshared-static.patch 
b/sys-boot/systemd-boot/files/237-libshared-static.patch
new file mode 100644
index 000..9966a5f7916
--- /dev/null
+++ b/sys-boot/systemd-boot/files/237-libshared-static.patch
@@ -0,0 +1,15 @@
+diff --git a/meson.build b/meson.build
+index 36a62d280..87f8da29b 100644
+--- a/meson.build
 b/meson.build
+@@ -1662,9 +1662,8 @@ if conf.get('ENABLE_EFI') == 1 and 
conf.get('HAVE_BLKID') == 1
+ exe = executable('bootctl',
+  'src/boot/bootctl.c',
+  include_directories : includes,
+- link_with : [libshared],
++ link_with : [libshared_static, libsystemd_static],
+  dependencies : [libblkid],
+- install_rpath : rootlibexecdir,
+  install : true)
+ public_programs += [exe]
+ endif

diff --git a/sys-boot/systemd-boot/systemd-boot-237.ebuild 
b/sys-boot/systemd-boot/systemd-boot-237.ebuild
new file mode 100644
index 000..48d61ac38b2
--- /dev/null
+++ b/sys-boot/systemd-boot/systemd-boot-237.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson toolchain-funcs
+
+DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/;
+SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> 
systemd-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="test"
+
+COMMON_DEPEND="
+   >=sys-apps/util-linux-2.30
+"
+DEPEND="${COMMON_DEPEND}
+   app-text/docbook-xml-dtd:4.2
+   app-text/docbook-xml-dtd:4.5
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt:0
+   >=dev-util/intltool-0.50
+   dev-util/gperf
+   >=sys-boot/gnu-efi-3.0.2
+   sys-libs/libcap
+   virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+   !sys-apps/systemd
+"
+
+S="${WORKDIR}/systemd-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/237-libshared-static.patch"
+)
+
+src_configure() {
+   local emesonargs=(
+   -D blkid=true
+   -D efi=true
+   -D gnu-efi=true
+   -D efi-cc="$(tc-getCC)"
+   -D efi-ld="$(tc-getLD)"
+   -D split-usr=true
+   -D rootprefix="${EPREFIX:-/}"
+
+   -D acl=false
+   -D apparmor=false
+   -D audit=false
+   -D bzip2=false
+   -D elfutils=false
+   -D gcrypt=false
+   -D gnutls=false
+   -D kmod=false
+   -D libcryptsetup=false
+   -D libcurl=false
+   -D libidn=false
+   -D libidn2=false
+   -D libiptc=false
+   -D lz4=false
+   -D microhttpd=false
+   -D myhostname=false
+   -D pam=false
+   -D qrencode=false
+   -D seccomp=false
+   -D selinux=false
+   -D xkbcommon=false
+

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/files/, sys-boot/systemd-boot/

2017-11-20 Thread Mike Gilbert 
commit: b0b74ce3b8aa90a952db8dd1062e4a0a9865f3b6
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Nov 20 19:10:55 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 20 19:14:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0b74ce3

sys-boot/systemd-boot: bump to 235

Closes: https://bugs.gentoo.org/638238
Package-Manager: Portage-2.3.14_p5, Repoman-2.3.6

 sys-boot/systemd-boot/Manifest |   1 +
 .../systemd-boot/files/235-libshared-static.patch  |  24 +
 sys-boot/systemd-boot/systemd-boot-235.ebuild  | 108 +
 3 files changed, 133 insertions(+)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 5848388fa13..25ff219e75d 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1 +1,2 @@
 DIST systemd-233.tar.gz 4660737 SHA256 
8b3e99da3d4164b66581830a7f2436c0c8fe697b5fbdc3927bdb960646be0083 SHA512 
5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
 WHIRLPOOL 
ce19f6a546b8f899cfa952e49d47f063fd29186be4a53391bc30ea2c487eb2c140a74ad843a1dc499bb61bba3e9ca055613852291e38b85af5d79c59409dc176
+DIST systemd-235.tar.gz 6586406 SHA256 
25811f96f5a027bf2a4c9383495cf5b623e385d84da31e473cf375932b3e9c52 SHA512 
243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993
 WHIRLPOOL 
05e50b31f7b3b1cd756abd1580dddae0e114953857564133784fc43b9ecd0e203ee534aaf76531ca7af5c43b03b9b73c6c1caf5afb17502555cc52fe06cd

diff --git a/sys-boot/systemd-boot/files/235-libshared-static.patch 
b/sys-boot/systemd-boot/files/235-libshared-static.patch
new file mode 100644
index 000..2a0bf678539
--- /dev/null
+++ b/sys-boot/systemd-boot/files/235-libshared-static.patch
@@ -0,0 +1,24 @@
+--- a/meson.build
 b/meson.build
+@@ -1505,9 +1505,8 @@ if conf.get('ENABLE_EFI') == 1 and 
conf.get('HAVE_BLKID') == 1
+ exe = executable('bootctl',
+  'src/boot/bootctl.c',
+  include_directories : includes,
+- link_with : [libshared],
++ link_with : [libshared_static],
+  dependencies : [libblkid],
+- install_rpath : rootlibexecdir,
+  install : true)
+ public_programs += [exe]
+ endif
+diff --git a/src/shared/meson.build b/src/shared/meson.build
+index 883821352..b560e65c9 100644
+--- a/src/shared/meson.build
 b/src/shared/meson.build
+@@ -157,5 +157,6 @@ libshared_static = static_library(
+ libshared_name,
+ shared_sources,
+ basic_sources,
++libsystemd_internal_sources,
+ include_directories : includes,
+ dependencies : libshared_deps)

diff --git a/sys-boot/systemd-boot/systemd-boot-235.ebuild 
b/sys-boot/systemd-boot/systemd-boot-235.ebuild
new file mode 100644
index 000..ff86b01e755
--- /dev/null
+++ b/sys-boot/systemd-boot/systemd-boot-235.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson toolchain-funcs
+
+DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/;
+SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> 
systemd-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="test"
+
+COMMON_DEPEND="
+   >=sys-apps/util-linux-2.30
+"
+DEPEND="${COMMON_DEPEND}
+   app-text/docbook-xml-dtd:4.2
+   app-text/docbook-xml-dtd:4.5
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt:0
+   >=dev-util/intltool-0.50
+   dev-util/gperf
+   >=sys-boot/gnu-efi-3.0.2
+   sys-libs/libcap
+   virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+   !sys-apps/systemd
+"
+
+S="${WORKDIR}/systemd-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/235-libshared-static.patch"
+)
+
+src_configure() {
+   local emesonargs=(
+   -D blkid=true
+   -D efi=true
+   -D gnu-efi=true
+   -D efi-cc="$(tc-getCC)"
+   -D efi-ld="$(tc-getLD)"
+
+   -D acl=false
+   -D apparmor=false
+   -D audit=false
+   -D bzip2=false
+   -D elfutils=false
+   -D gcrypt=false
+   -D gnutls=false
+   -D kmod=false
+   -D libcryptsetup=false
+   -D libcurl=false
+   -D libidn=false
+   -D libidn2=false
+   -D libiptc=false
+   -D lz4=false
+   -D microhttpd=false
+   -D myhostname=false
+   -D pam=false
+   -D qrencode=false
+   -D seccomp=false
+

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/files/

2017-08-13 Thread David Seifert 
commit: ebeab9d40a266a378887ca219f400c77120cce0f
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Fri Aug 11 14:56:32 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Aug 13 11:28:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebeab9d4

sys-boot/systemd-boot: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/5390

 ...dd-check-for-gperf-lookup-function-signat.patch | 302 -
 1 file changed, 302 deletions(-)

diff --git 
a/sys-boot/systemd-boot/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch
 
b/sys-boot/systemd-boot/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch
deleted file mode 100644
index 440ec75bd3b..000
--- 
a/sys-boot/systemd-boot/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-From 016fb3b83b861cfe58694996076a9764dcb46475 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert 
-Date: Tue, 10 Jan 2017 02:39:05 -0500
-Subject: [PATCH 2/2] build-sys: add check for gperf lookup function signature
- (#5055)
-
-gperf-3.1 generates lookup functions that take a size_t length
-parameter instead of unsigned int. Test for this at configure time.
-
-Fixes: https://github.com/systemd/systemd/issues/5039

- configure.ac | 22 ++
- src/basic/af-list.c  |  2 +-
- src/basic/arphrd-list.c  |  2 +-
- src/basic/cap-list.c |  2 +-
- src/basic/errno-list.c   |  2 +-
- src/core/load-fragment.h |  2 +-
- src/journal/journald-server.h|  2 +-
- src/login/logind.h   |  2 +-
- src/network/networkd-conf.h  |  2 +-
- src/network/networkd-netdev.h|  2 +-
- src/network/networkd-network.h   |  2 +-
- src/nspawn/nspawn-settings.h |  2 +-
- src/resolve/dns-type.c   |  2 +-
- src/resolve/resolved-conf.h  |  2 +-
- src/test/test-af-list.c  |  2 +-
- src/test/test-arphrd-list.c  |  2 +-
- src/timesync/timesyncd-conf.h|  2 +-
- src/udev/net/link-config.h   |  2 +-
- src/udev/udev-builtin-keyboard.c |  2 +-
- 19 files changed, 40 insertions(+), 18 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1928e65bd..5c639e32d 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -258,6 +258,28 @@ AC_CHECK_SIZEOF(rlim_t,,[
-#include 
- ])
- 
-+GPERF_TEST="$(echo foo,bar | ${GPERF} -L ANSI-C)"
-+
-+AC_COMPILE_IFELSE(
-+[AC_LANG_PROGRAM([
-+#include 
-+const char * in_word_set(const char *, size_t);
-+$GPERF_TEST]
-+)],
-+[GPERF_LEN_TYPE=size_t],
-+[AC_COMPILE_IFELSE(
-+[AC_LANG_PROGRAM([
-+#include 
-+const char * in_word_set(const char *, unsigned);
-+$GPERF_TEST]
-+)],
-+[GPERF_LEN_TYPE=unsigned],
-+[AC_MSG_ERROR([** unable to determine gperf len type])]
-+)]
-+)
-+
-+AC_DEFINE_UNQUOTED([GPERF_LEN_TYPE], [$GPERF_LEN_TYPE], [gperf len type])
-+
- # 
--
- # we use python to build the man page index
- have_python=no
-diff --git a/src/basic/af-list.c b/src/basic/af-list.c
-index 3fac9c508..4b291d177 100644
 a/src/basic/af-list.c
-+++ b/src/basic/af-list.c
-@@ -23,7 +23,7 @@
- #include "af-list.h"
- #include "macro.h"
- 
--static const struct af_name* lookup_af(register const char *str, register 
unsigned int len);
-+static const struct af_name* lookup_af(register const char *str, register 
GPERF_LEN_TYPE len);
- 
- #include "af-from-name.h"
- #include "af-to-name.h"
-diff --git a/src/basic/arphrd-list.c b/src/basic/arphrd-list.c
-index 6792d1ee3..2d598dc66 100644
 a/src/basic/arphrd-list.c
-+++ b/src/basic/arphrd-list.c
-@@ -23,7 +23,7 @@
- #include "arphrd-list.h"
- #include "macro.h"
- 
--static const struct arphrd_name* lookup_arphrd(register const char *str, 
register unsigned int len);
-+static const struct arphrd_name* lookup_arphrd(register const char *str, 
register GPERF_LEN_TYPE len);
- 
- #include "arphrd-from-name.h"
- #include "arphrd-to-name.h"
-diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c
-index 3e773a06f..d68cc78d0 100644
 a/src/basic/cap-list.c
-+++ b/src/basic/cap-list.c
-@@ -26,7 +26,7 @@
- #include "parse-util.h"
- #include "util.h"
- 
--static const struct capability_name* lookup_capability(register const char 
*str, register unsigned int len);
-+static const struct capability_name* lookup_capability(register const char 
*str, register GPERF_LEN_TYPE len);
- 
- #include "cap-from-name.h"
- #include "cap-to-name.h"
-diff --git a/src/basic/errno-list.c b/src/basic/errno-list.c
-index 31b66bad5..c6a01eec8 100644
 a/src/basic/errno-list.c
-+++ b/src/basic/errno-list.c
-@@ -23,7 +23,7 @@
- #include

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2017-07-02 Thread Mike Gilbert 
commit: cca7f80feb0c707d9e9ac78577e76d4f3c4a3153
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Jul  2 15:37:03 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Jul  2 15:37:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cca7f80f

sys-boot/systemd-boot: restrict test

Bug: https://bugs.gentoo.org/623546
Package-Manager: Portage-2.3.6_p9, Repoman-2.3.2_p77

 sys-boot/systemd-boot/systemd-boot-233.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-boot/systemd-boot/systemd-boot-233.ebuild 
b/sys-boot/systemd-boot/systemd-boot-233.ebuild
index 52aa812768a..313b919e089 100644
--- a/sys-boot/systemd-boot/systemd-boot-233.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-233.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
+RESTRICT="test"
 
 COMMON_DEPEND="
>=sys-apps/util-linux-2.27.1

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2017-07-02 Thread Mike Gilbert 
commit: bc66500710ec040ef242342447694d91f1ffa8f0
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Jul  2 15:37:41 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Jul  2 15:37:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc665007

sys-boot/systemd-boot: remove old

Package-Manager: Portage-2.3.6_p9, Repoman-2.3.2_p77

 sys-boot/systemd-boot/Manifest   |   2 -
 sys-boot/systemd-boot/systemd-boot-231-r1.ebuild | 125 ---
 sys-boot/systemd-boot/systemd-boot-232.ebuild| 114 -
 3 files changed, 241 deletions(-)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 71c131fed62..5848388fa13 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,3 +1 @@
-DIST systemd-231.tar.gz 4381464 SHA256 
899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 
199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6
 WHIRLPOOL 
7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
-DIST systemd-232.tar.gz 4529048 SHA256 
1172c7c7d5d72fbded53186e7599d5272231f04cc8b72f9a0fb2c5c20dfc4880 SHA512 
5dbe52f655ec2901b1bfbb1256f83ba26bc82c13097ac9a82e4fbb97886551530f9888c369592f1b410cfff40d6d127b985533a3e29cfab5b30d18739ee5dcb1
 WHIRLPOOL 
f2a1499584c5b5c4d9e945e45ef5e0eef2e8be77acdbd7b3b29a8c8b62dc7a10c162a856df7107c19e2eb19e63bc43a33433686472ca30909237981683cbe980
 DIST systemd-233.tar.gz 4660737 SHA256 
8b3e99da3d4164b66581830a7f2436c0c8fe697b5fbdc3927bdb960646be0083 SHA512 
5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
 WHIRLPOOL 
ce19f6a546b8f899cfa952e49d47f063fd29186be4a53391bc30ea2c487eb2c140a74ad843a1dc499bb61bba3e9ca055613852291e38b85af5d79c59409dc176

diff --git a/sys-boot/systemd-boot/systemd-boot-231-r1.ebuild 
b/sys-boot/systemd-boot/systemd-boot-231-r1.ebuild
deleted file mode 100644
index 3fe25b2193b..000
--- a/sys-boot/systemd-boot/systemd-boot-231-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/;
-SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> 
systemd-${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEPEND="
-   >=sys-apps/util-linux-2.27.1:0=
-   sys-libs/libcap:=
-"
-DEPEND="${COMMON_DEPEND}
-   app-text/docbook-xml-dtd:4.2
-   app-text/docbook-xml-dtd:4.5
-   app-text/docbook-xsl-stylesheets
-   dev-libs/libxslt:0
-   >=dev-util/intltool-0.50
-   >=sys-boot/gnu-efi-3.0.2
-"
-RDEPEND="${COMMON_DEPEND}
-   !sys-apps/systemd
-"
-
-S="${WORKDIR}/systemd-${PV}"
-
-PATCHES=(
-   
"${FILESDIR}"/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch
-)
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   local myeconfargs=(
-   EFI_CC="$(tc-getPROG "EFI_CC CC" gcc)"
-   cc_cv_CFLAGS__flto=no
-   cc_cv_LDFLAGS__Wl__fuse_ld_gold=no
-   --enable-blkid
-   --enable-efi
-   --enable-gnuefi
-   --disable-acl
-   --disable-apparmor
-   --disable-audit
-   --disable-bzip2
-   --disable-elfutils
-   --disable-gcrypt
-   --disable-gnutls
-   --disable-kmod
-   --disable-libcryptsetup
-   --disable-libcurl
-   --disable-libidn
-   --disable-lz4
-   --disable-microhttpd
-   --disable-myhostname
-   --disable-pam
-   --disable-qrencode
-   --disable-seccomp
-   --disable-selinux
-   --disable-xkbcommon
-   --disable-xz
-   --disable-zlib
-   )
-   econf "${myeconfargs[@]}"
-}
-
-efi-mt() {
-   case "$(tc-arch)" in
-   amd64) echo x64 ;;
-   arm64) echo aa64 ;;
-   x86) echo ia32 ;;
-   *) die "Unsupported arch" ;;
-   esac
-}
-
-src_compile() {
-   local args=(
-   libsystemd-shared.la
-   bootctl
-   man/bootctl.1
-   man/kernel-install.8
-   linux$(efi-mt).efi.stub
-   systemd-boot$(efi-mt).efi
-   )
-   emake built-sources
-   emake "${args[@]}"
-}
-
-src_install() {
-   local args=(
-   DESTDIR="${D%/}"
-
-   # libsystemd-shared
-

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/files/, sys-boot/systemd-boot/

2017-05-30 Thread Mike Gilbert 
commit: e297bb1001aaa9a87abb86f28c4ac786d7c97b45
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue May 30 18:50:50 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue May 30 18:51:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e297bb10

sys-boot/systemd-boot: bump to 233

Package-Manager: Portage-2.3.6_p1, Repoman-2.3.2_p69

 sys-boot/systemd-boot/Manifest |   1 +
 .../233-Force-libsystemd-shared-to-be-static.patch |  25 +
 sys-boot/systemd-boot/systemd-boot-233.ebuild  | 110 +
 3 files changed, 136 insertions(+)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index e2bcea5e83a..71c131fed62 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,2 +1,3 @@
 DIST systemd-231.tar.gz 4381464 SHA256 
899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 
199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6
 WHIRLPOOL 
7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
 DIST systemd-232.tar.gz 4529048 SHA256 
1172c7c7d5d72fbded53186e7599d5272231f04cc8b72f9a0fb2c5c20dfc4880 SHA512 
5dbe52f655ec2901b1bfbb1256f83ba26bc82c13097ac9a82e4fbb97886551530f9888c369592f1b410cfff40d6d127b985533a3e29cfab5b30d18739ee5dcb1
 WHIRLPOOL 
f2a1499584c5b5c4d9e945e45ef5e0eef2e8be77acdbd7b3b29a8c8b62dc7a10c162a856df7107c19e2eb19e63bc43a33433686472ca30909237981683cbe980
+DIST systemd-233.tar.gz 4660737 SHA256 
8b3e99da3d4164b66581830a7f2436c0c8fe697b5fbdc3927bdb960646be0083 SHA512 
5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
 WHIRLPOOL 
ce19f6a546b8f899cfa952e49d47f063fd29186be4a53391bc30ea2c487eb2c140a74ad843a1dc499bb61bba3e9ca055613852291e38b85af5d79c59409dc176

diff --git 
a/sys-boot/systemd-boot/files/233-Force-libsystemd-shared-to-be-static.patch 
b/sys-boot/systemd-boot/files/233-Force-libsystemd-shared-to-be-static.patch
new file mode 100644
index 000..b837890f616
--- /dev/null
+++ b/sys-boot/systemd-boot/files/233-Force-libsystemd-shared-to-be-static.patch
@@ -0,0 +1,25 @@
+From 5aefd5fddd2af5f979ece96cda8ed1ab0492709c Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Tue, 30 May 2017 14:05:41 -0400
+Subject: [PATCH] Force libsystemd-shared to be static
+
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 2a5610740..4e95cb316 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -1145,7 +1145,7 @@ libshared_la_LIBADD = \
+   $(BLKID_LIBS) \
+   $(LIBCRYPTSETUP_LIBS)
+ 
+-rootlibexec_LTLIBRARIES += \
++noinst_LTLIBRARIES += \
+   libsystemd-shared.la
+ 
+ libsystemd_shared_la_SOURCES = \
+-- 
+2.13.0
+

diff --git a/sys-boot/systemd-boot/systemd-boot-233.ebuild 
b/sys-boot/systemd-boot/systemd-boot-233.ebuild
new file mode 100644
index 000..52aa812768a
--- /dev/null
+++ b/sys-boot/systemd-boot/systemd-boot-233.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/;
+SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> 
systemd-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND="
+   >=sys-apps/util-linux-2.27.1
+"
+DEPEND="${COMMON_DEPEND}
+   app-text/docbook-xml-dtd:4.2
+   app-text/docbook-xml-dtd:4.5
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt:0
+   >=dev-util/intltool-0.50
+   dev-util/gperf
+   >=sys-boot/gnu-efi-3.0.2
+   sys-libs/libcap
+   virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+   !sys-apps/systemd
+"
+
+S="${WORKDIR}/systemd-${PV}"
+
+PATCHES=(
+   "${FILESDIR}"/233-Force-libsystemd-shared-to-be-static.patch
+)
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   local myeconfargs=(
+   EFI_CC="$(tc-getPROG "EFI_CC CC" gcc)"
+   cc_cv_CFLAGS__flto=no
+   cc_cv_LDFLAGS__Wl__fuse_ld_gold=no
+   --enable-blkid
+   --enable-efi
+   --enable-gnuefi
+   --disable-acl
+   --disable-apparmor
+   --disable-audit
+   --disable-bzip2
+   --disable-elfutils
+   --disable-gcrypt
+   --disable-gnutls
+   --disable-kmod
+   --disable-libcryptsetup
+   --disable-libcurl
+   --disable-libidn
+   --disable-lz4
+   --disable-microhttpd
+

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/files/

2017-01-16 Thread Mike Gilbert 
commit: df8286a945b79614fcfd6e2b3bc35acc72f4450d
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Jan 16 16:20:18 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Jan 16 16:20:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df8286a9

sys-boot/systemd-boot: drop unused patch

Package-Manager: Portage-2.3.3_p32, Repoman-2.3.1_p25

 ...heck-for-lz4-in-the-old-and-new-numbering.patch | 44 --
 1 file changed, 44 deletions(-)

diff --git 
a/sys-boot/systemd-boot/files/232-0001-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch
 
b/sys-boot/systemd-boot/files/232-0001-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch
deleted file mode 100644
index 788f0aa..
--- 
a/sys-boot/systemd-boot/files/232-0001-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 63621678f44325b4c48574f9c9d7a3c499d1a608 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
-Date: Wed, 23 Nov 2016 10:18:30 -0500
-Subject: [PATCH 1/2] build-sys: check for lz4 in the old and new numbering
- scheme (#4717)
-
-lz4 upstream decided to switch to an incompatible numbering scheme
-(1.7.3 follows 131, to match the so version).
-PKG_CHECK_MODULES does not allow two version matches for the same package,
-so e.g. lz4 < 10 || lz4 >= 125 cannot be used. Check twice, once for
-"new" numbers (anything below 10 is assume to be new), once for the "old"
-numbers (anything above >= 125). This assumes that the "new" versioning
-will not get to 10 to quickly. I think that's a safe assumption, lz4 is a
-mature project.
-
-Fixed #4690.

- configure.ac | 9 ++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0b10fc7de..1928e65bd 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -623,10 +623,13 @@ AM_CONDITIONAL(HAVE_BZIP2, [test "$have_bzip2" = "yes"])
- have_lz4=no
- AC_ARG_ENABLE(lz4, AS_HELP_STRING([--disable-lz4], [Disable optional LZ4 
support]))
- AS_IF([test "x$enable_lz4" != "xno"], [
--PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ],
--   [AC_DEFINE(HAVE_LZ4, 1, [Define in LZ4 is available])
-+PKG_CHECK_MODULES(LZ4, [ liblz4 < 10 ],
-+   [AC_DEFINE(HAVE_LZ4, 1, [Define if LZ4 is available])
- have_lz4=yes],
--have_lz4=no)
-+[PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ],
-+  [AC_DEFINE(HAVE_LZ4, 1, [Define if LZ4 is available])
-+  have_lz4=yes],
-+  have_lz4=no)])
- AS_IF([test "x$have_lz4" = xno -a "x$enable_lz4" = xyes],
-   [AC_MSG_ERROR([*** LZ4 support requested but libraries not 
found])])
- ])
--- 
-2.11.0
-

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/, sys-boot/systemd-boot/files/

2017-01-16 Thread Mike Gilbert 
commit: 25e6e1301bfa4bdec12346cc95a8b420a53db5f6
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Jan 16 16:18:04 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Jan 16 16:19:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25e6e130

sys-boot/systemd-boot: fix build with gperf-3.1

Bug: https://bugs.gentoo.org/605848
Package-Manager: Portage-2.3.3_p32, Repoman-2.3.1_p25

 ...heck-for-lz4-in-the-old-and-new-numbering.patch |  44 +++
 ...dd-check-for-gperf-lookup-function-signat.patch | 302 +
 sys-boot/systemd-boot/systemd-boot-231-r1.ebuild   |   6 +-
 sys-boot/systemd-boot/systemd-boot-232.ebuild  |   6 +-
 4 files changed, 356 insertions(+), 2 deletions(-)

diff --git 
a/sys-boot/systemd-boot/files/232-0001-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch
 
b/sys-boot/systemd-boot/files/232-0001-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch
new file mode 100644
index ..788f0aa
--- /dev/null
+++ 
b/sys-boot/systemd-boot/files/232-0001-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch
@@ -0,0 +1,44 @@
+From 63621678f44325b4c48574f9c9d7a3c499d1a608 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 
+Date: Wed, 23 Nov 2016 10:18:30 -0500
+Subject: [PATCH 1/2] build-sys: check for lz4 in the old and new numbering
+ scheme (#4717)
+
+lz4 upstream decided to switch to an incompatible numbering scheme
+(1.7.3 follows 131, to match the so version).
+PKG_CHECK_MODULES does not allow two version matches for the same package,
+so e.g. lz4 < 10 || lz4 >= 125 cannot be used. Check twice, once for
+"new" numbers (anything below 10 is assume to be new), once for the "old"
+numbers (anything above >= 125). This assumes that the "new" versioning
+will not get to 10 to quickly. I think that's a safe assumption, lz4 is a
+mature project.
+
+Fixed #4690.
+---
+ configure.ac | 9 ++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0b10fc7de..1928e65bd 100644
+--- a/configure.ac
 b/configure.ac
+@@ -623,10 +623,13 @@ AM_CONDITIONAL(HAVE_BZIP2, [test "$have_bzip2" = "yes"])
+ have_lz4=no
+ AC_ARG_ENABLE(lz4, AS_HELP_STRING([--disable-lz4], [Disable optional LZ4 
support]))
+ AS_IF([test "x$enable_lz4" != "xno"], [
+-PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ],
+-   [AC_DEFINE(HAVE_LZ4, 1, [Define in LZ4 is available])
++PKG_CHECK_MODULES(LZ4, [ liblz4 < 10 ],
++   [AC_DEFINE(HAVE_LZ4, 1, [Define if LZ4 is available])
+ have_lz4=yes],
+-have_lz4=no)
++[PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ],
++  [AC_DEFINE(HAVE_LZ4, 1, [Define if LZ4 is available])
++  have_lz4=yes],
++  have_lz4=no)])
+ AS_IF([test "x$have_lz4" = xno -a "x$enable_lz4" = xyes],
+   [AC_MSG_ERROR([*** LZ4 support requested but libraries not 
found])])
+ ])
+-- 
+2.11.0
+

diff --git 
a/sys-boot/systemd-boot/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch
 
b/sys-boot/systemd-boot/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch
new file mode 100644
index ..440ec75
--- /dev/null
+++ 
b/sys-boot/systemd-boot/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch
@@ -0,0 +1,302 @@
+From 016fb3b83b861cfe58694996076a9764dcb46475 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Tue, 10 Jan 2017 02:39:05 -0500
+Subject: [PATCH 2/2] build-sys: add check for gperf lookup function signature
+ (#5055)
+
+gperf-3.1 generates lookup functions that take a size_t length
+parameter instead of unsigned int. Test for this at configure time.
+
+Fixes: https://github.com/systemd/systemd/issues/5039
+---
+ configure.ac | 22 ++
+ src/basic/af-list.c  |  2 +-
+ src/basic/arphrd-list.c  |  2 +-
+ src/basic/cap-list.c |  2 +-
+ src/basic/errno-list.c   |  2 +-
+ src/core/load-fragment.h |  2 +-
+ src/journal/journald-server.h|  2 +-
+ src/login/logind.h   |  2 +-
+ src/network/networkd-conf.h  |  2 +-
+ src/network/networkd-netdev.h|  2 +-
+ src/network/networkd-network.h   |  2 +-
+ src/nspawn/nspawn-settings.h |  2 +-
+ src/resolve/dns-type.c   |  2 +-
+ src/resolve/resolved-conf.h  |  2 +-
+ src/test/test-af-list.c  |  2 +-
+ src/test/test-arphrd-list.c  |  2 +-
+ src/timesync/timesyncd-conf.h|  2 +-
+ src/udev/net/link-config.h   |  2 +-
+ src/udev/udev-builtin-keyboard.c |  2 +-
+ 19 files changed, 40 insertions(+), 18 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1928e65bd..5c639e32d 100644
+--- a/configure.ac
 b/configure.ac
+@@ -258,6 +258,28 @@ AC_CHECK_SIZEOF(rlim_t,,[
+#include 
+ ])
+ 
++GPERF_TEST="$(echo

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2016-11-04 Thread Mike Gilbert 
commit: a2b40dadc2b68b344896b8e7ac49dab9aabe1c4e
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Nov  4 16:23:12 2016 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Nov  4 16:23:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2b40dad

sys-boot/systemd-boot: bump to 232

Package-Manager: portage-2.3.2_p4

 sys-boot/systemd-boot/Manifest|   1 +
 sys-boot/systemd-boot/systemd-boot-232.ebuild | 111 ++
 2 files changed, 112 insertions(+)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index b8044e3..e2bcea5 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1 +1,2 @@
 DIST systemd-231.tar.gz 4381464 SHA256 
899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 
199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6
 WHIRLPOOL 
7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
+DIST systemd-232.tar.gz 4529048 SHA256 
1172c7c7d5d72fbded53186e7599d5272231f04cc8b72f9a0fb2c5c20dfc4880 SHA512 
5dbe52f655ec2901b1bfbb1256f83ba26bc82c13097ac9a82e4fbb97886551530f9888c369592f1b410cfff40d6d127b985533a3e29cfab5b30d18739ee5dcb1
 WHIRLPOOL 
f2a1499584c5b5c4d9e945e45ef5e0eef2e8be77acdbd7b3b29a8c8b62dc7a10c162a856df7107c19e2eb19e63bc43a33433686472ca30909237981683cbe980

diff --git a/sys-boot/systemd-boot/systemd-boot-232.ebuild 
b/sys-boot/systemd-boot/systemd-boot-232.ebuild
new file mode 100644
index ..03bc1dd
--- /dev/null
+++ b/sys-boot/systemd-boot/systemd-boot-232.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/;
+SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> 
systemd-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND="
+   >=sys-apps/util-linux-2.27.1:0=
+   sys-libs/libcap:=
+"
+DEPEND="${COMMON_DEPEND}
+   app-text/docbook-xml-dtd:4.2
+   app-text/docbook-xml-dtd:4.5
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt:0
+   >=dev-util/intltool-0.50
+   >=sys-boot/gnu-efi-3.0.2
+"
+RDEPEND="${COMMON_DEPEND}
+   !sys-apps/systemd
+"
+
+S="${WORKDIR}/systemd-${PV}"
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   local myeconfargs=(
+   EFI_CC="$(tc-getPROG "EFI_CC CC" gcc)"
+   cc_cv_CFLAGS__flto=no
+   cc_cv_LDFLAGS__Wl__fuse_ld_gold=no
+   --enable-blkid
+   --enable-efi
+   --enable-gnuefi
+   --disable-acl
+   --disable-apparmor
+   --disable-audit
+   --disable-bzip2
+   --disable-elfutils
+   --disable-gcrypt
+   --disable-gnutls
+   --disable-kmod
+   --disable-libcryptsetup
+   --disable-libcurl
+   --disable-libidn
+   --disable-lz4
+   --disable-microhttpd
+   --disable-myhostname
+   --disable-pam
+   --disable-qrencode
+   --disable-seccomp
+   --disable-selinux
+   --disable-xkbcommon
+   --disable-xz
+   --disable-zlib
+   )
+   econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   local targets=(
+   libsystemd-shared.la
+   bootctl
+   man/bootctl.1
+   man/kernel-install.8
+   '$(bootlib_DATA)'
+   )
+   emake built-sources
+   echo "gentoo: ${targets[*]}" | emake -f Makefile -f - gentoo
+}
+
+src_install() {
+   local args=(
+   DESTDIR="${D%/}"
+
+   # libsystemd-shared
+   rootlibexec_LTLIBRARIES=libsystemd-shared.la
+   install-rootlibexecLTLIBRARIES
+
+   # bootctl
+   bin_PROGRAMS=bootctl
+   install-binPROGRAMS
+
+   # kernel-install
+   install-dist_binSCRIPTS
+   install-dist_kernelinstallSCRIPTS
+
+   man_MANS="man/bootctl.1 man/kernel-install.8"
+   install-man1
+   install-man8
+
+   install-bootlibDATA
+   )
+   emake "${args[@]}"
+   prune_libtool_files
+   einstalldocs
+}

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2016-10-30 Thread Mike Gilbert 
commit: 9efad7295d0ecaf9672f607445dfee6cb4d553a6
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Oct 30 16:50:16 2016 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Oct 30 16:51:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9efad729

sys-boot/systemd-boot: include kernel-install script

Bug: https://bugs.gentoo.org/598505

Package-Manager: portage-2.3.2_p1

 .../{systemd-boot-231.ebuild => systemd-boot-231-r1.ebuild}   | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sys-boot/systemd-boot/systemd-boot-231.ebuild 
b/sys-boot/systemd-boot/systemd-boot-231-r1.ebuild
similarity index 92%
rename from sys-boot/systemd-boot/systemd-boot-231.ebuild
rename to sys-boot/systemd-boot/systemd-boot-231-r1.ebuild
index 6b33d8c..149a561 100644
--- a/sys-boot/systemd-boot/systemd-boot-231.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-231-r1.ebuild
@@ -85,6 +85,7 @@ src_compile() {
libsystemd-shared.la
bootctl
man/bootctl.1
+   man/kernel-install.8
linux$(efi-mt).efi.stub
systemd-boot$(efi-mt).efi
)
@@ -105,8 +106,13 @@ src_install() {
bin_PROGRAMS=bootctl
install-binPROGRAMS
 
-   man_MANS=man/bootctl.1
+   # kernel-install
+   install-dist_binSCRIPTS
+   install-dist_kernelinstallSCRIPTS
+
+   man_MANS="man/bootctl.1 man/kernel-install.8"
install-man1
+   install-man8
 
install-bootlibDATA
)

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2016-09-03 Thread Mike Gilbert 
commit: 36c587c83bf80fac62e3503d6cbc1c1404b71ab2
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Sep  3 18:06:38 2016 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Sep  3 18:07:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36c587c8

sys-boot/systemd-boot: depend on app-text/docbook-xml-dtd:4.5

Bug: https://bugs.gentoo.org/592716

Package-Manager: portage-2.3.0_p24

 sys-boot/systemd-boot/systemd-boot-231.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-boot/systemd-boot/systemd-boot-231.ebuild 
b/sys-boot/systemd-boot/systemd-boot-231.ebuild
index 899e9da..6b33d8c 100644
--- a/sys-boot/systemd-boot/systemd-boot-231.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-231.ebuild
@@ -21,6 +21,7 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.2
+   app-text/docbook-xml-dtd:4.5
app-text/docbook-xsl-stylesheets
dev-libs/libxslt:0
>=dev-util/intltool-0.50

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2016-08-28 Thread Mike Gilbert 
commit: e87f60c29cbfa6b99946c474a8809d4df4ecd56c
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Aug 28 15:27:47 2016 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Aug 28 15:27:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e87f60c2

sys-boot/systemd-boot: replace CVS Header keyword

 sys-boot/systemd-boot/systemd-boot-231.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/systemd-boot/systemd-boot-231.ebuild 
b/sys-boot/systemd-boot/systemd-boot-231.ebuild
index c034512..899e9da 100644
--- a/sys-boot/systemd-boot/systemd-boot-231.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-231.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=6

[gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/

2016-08-28 Thread Mike Gilbert 
commit: ab87fe67fa6223fceb34f586df3e6ce1cd8a1819
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Aug 28 15:09:53 2016 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Aug 28 15:10:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab87fe67

sys-boot/systemd-boot: replacement for sys-boot/gummiboot

Bug: https://bugs.gentoo.org/556734

Package-Manager: portage-2.3.0_p22

 sys-boot/systemd-boot/Manifest|   1 +
 sys-boot/systemd-boot/metadata.xml|   8 ++
 sys-boot/systemd-boot/systemd-boot-231.ebuild | 115 ++
 3 files changed, 124 insertions(+)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
new file mode 100644
index ..b8044e3
--- /dev/null
+++ b/sys-boot/systemd-boot/Manifest
@@ -0,0 +1 @@
+DIST systemd-231.tar.gz 4381464 SHA256 
899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 
199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6
 WHIRLPOOL 
7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1

diff --git a/sys-boot/systemd-boot/metadata.xml 
b/sys-boot/systemd-boot/metadata.xml
new file mode 100644
index ..de09ffd
--- /dev/null
+++ b/sys-boot/systemd-boot/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   flop...@gentoo.org
+   Mike Gilbert
+   
+

diff --git a/sys-boot/systemd-boot/systemd-boot-231.ebuild 
b/sys-boot/systemd-boot/systemd-boot-231.ebuild
new file mode 100644
index ..c034512
--- /dev/null
+++ b/sys-boot/systemd-boot/systemd-boot-231.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=6
+
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/;
+SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> 
systemd-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND="
+   >=sys-apps/util-linux-2.27.1:0=
+   sys-libs/libcap:=
+"
+DEPEND="${COMMON_DEPEND}
+   app-text/docbook-xml-dtd:4.2
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt:0
+   >=dev-util/intltool-0.50
+   >=sys-boot/gnu-efi-3.0.2
+"
+RDEPEND="${COMMON_DEPEND}
+   !sys-apps/systemd
+"
+
+S="${WORKDIR}/systemd-${PV}"
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   local myeconfargs=(
+   EFI_CC="$(tc-getPROG "EFI_CC CC" gcc)"
+   cc_cv_CFLAGS__flto=no
+   cc_cv_LDFLAGS__Wl__fuse_ld_gold=no
+   --enable-blkid
+   --enable-efi
+   --enable-gnuefi
+   --disable-acl
+   --disable-apparmor
+   --disable-audit
+   --disable-bzip2
+   --disable-elfutils
+   --disable-gcrypt
+   --disable-gnutls
+   --disable-kmod
+   --disable-libcryptsetup
+   --disable-libcurl
+   --disable-libidn
+   --disable-lz4
+   --disable-microhttpd
+   --disable-myhostname
+   --disable-pam
+   --disable-qrencode
+   --disable-seccomp
+   --disable-selinux
+   --disable-xkbcommon
+   --disable-xz
+   --disable-zlib
+   )
+   econf "${myeconfargs[@]}"
+}
+
+efi-mt() {
+   case "$(tc-arch)" in
+   amd64) echo x64 ;;
+   arm64) echo aa64 ;;
+   x86) echo ia32 ;;
+   *) die "Unsupported arch" ;;
+   esac
+}
+
+src_compile() {
+   local args=(
+   libsystemd-shared.la
+   bootctl
+   man/bootctl.1
+   linux$(efi-mt).efi.stub
+   systemd-boot$(efi-mt).efi
+   )
+   emake built-sources
+   emake "${args[@]}"
+}
+
+src_install() {
+   local args=(
+   DESTDIR="${D%/}"
+
+   # libsystemd-shared
+   rootlibexec_LTLIBRARIES=libsystemd-shared.la
+   install-rootlibexecLTLIBRARIES
+
+   # bootctl
+   lib_LTLIBRARIES=
+   bin_PROGRAMS=bootctl
+   install-binPROGRAMS
+
+   man_MANS=man/bootctl.1
+   install-man1
+
+   install-bootlibDATA
+   )
+   emake "${args[@]}"
+   prune_libtool_files
+   einstalldocs
+}