Bump gnu-efi dep and remove Gentoo-specific paths.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 2c52042463e65ba2edeeb4f7b88f38016d6c7d9b..1dec0ca02c5c9955cbc0a563f0c3a4d9896869d1 100644 (file)
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.358 2015/04/11 14:05:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.359 2015/04/13 06:53:14 mgorny Exp $
+
+  13 Apr 2015; Michał Górny <mgorny@gentoo.org> systemd-9999.ebuild:
+  Bump gnu-efi dep and remove Gentoo-specific paths.
 
   11 Apr 2015; Michał Górny <mgorny@gentoo.org> metadata.xml,
   systemd-9999.ebuild:

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 2151889aef947020b6f39f248aa9def53a7eeccc..bf1889aea3f55d7430b041e6271b52c95b2101f0 100644 (file)
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -19,25 +19,25 @@ EBUILD systemd-216-r4.ebuild 16022 SHA256 49744d6fe5613da943a06fae7888106b84f222
 EBUILD systemd-218-r3.ebuild 15065 SHA256 ef6515f802c4be70c6591eada5e853c0d0c57a71fa918f3770159ba21e3c7460 SHA512 8897850f9f5ae6f947284559b1b30996651e14310862749dfc74878c15ed73f18db8f13e8ec0cf7a2f160e2fef2c2088d2a364ca07f9b90f7feee775eda332c9 WHIRLPOOL 3965a86cc6342d6ac818a4172f91d7b411db27bd2fb58a3c20c3fad7d2b032eadb2bf0715ddab47a264904609a949db77c5163775b030dc858da695ff13fffec
 EBUILD systemd-219-r1.ebuild 15241 SHA256 a2127df4530d956ea2d9b79166e7cbccc2d15169656876f4ab50de6f03b3f30a SHA512 640e4993b2b998bb717fb63c1969757fa75e3d7fba3a1cda729cdfba08b339a38a90235ebb140d996ba5f436749a5222a8262652932b2db3a54697bb637b4efd WHIRLPOOL 61b26c0ca3e1a4e249dbf4e91a5a1d8802d0c416d85efad35b8424a3825063efd83953e4ba79d8ce298e225a81a27cd13f7a83e596a2eff917e5f959394b64f3
 EBUILD systemd-219-r2.ebuild 15468 SHA256 8c75f61e275084fa72c4a13b020a9427e4202cbb08064775932bb4e9f9be70c0 SHA512 6f095a4c588ed5adaf1cd4955bf6a8dd329077c4a0a4329a598e7465ddaadbe3b54a8cdeb74af5ef555d5a31aaa345af58c8a1f66b67098e183da54bb3967f6b WHIRLPOOL ceaa193c6b924480c82404697cc2007a6221b7f39736c8a757a65271bee58bf354aeed54be56f904e7633e92dcdccbdbafe993db77a647f469acdd0ba4ba5529
-EBUILD systemd-9999.ebuild 15914 SHA256 96bb67b7fb63fc916a0e0b81bbceaa8ef7cd47cf836896212932dbdd844d77e0 SHA512 aeb699b4406dfaf24575fac89574e8c1a136fbafe7b858ea9c8335082e0e0aa2802450b947b83a6064ad4bd3c01e4cbf0de0b64696bc344802b674dbdb694071 WHIRLPOOL 1cf4065ec2f633d5e756bb3aeb9292644ce242a8bd27ca72310d8c38b815137e3025413a38b62cca4b9425065be70035d30c8111e176571735ada54f4f5f7a80
-MISC ChangeLog 63585 SHA256 ee0d28a5e91585fa68a678bca475ded0391a36b292b7958e5f87e368cbd51268 SHA512 76b8e6378945870cdd69282f3158fa124a0aa5d6471468fdbb3cba0841f75e0b9b9985bfbf0165b97374b7a71b889c20d8c94be62980c6781499821621172987 WHIRLPOOL 32f61d3ed77a2fa148546bf0f1623249295594bd2662b93f207967e4a3ad52c488399853d832d3320345dfbc94e18f502e9c9a328c6f9b6f57e856ecc1a76b11
+EBUILD systemd-9999.ebuild 15840 SHA256 616e3d06c60deb9928a9b49e636094f6930622ebc2ea20de40fcb1274a23a0ba SHA512 b0971a719c8e3014f35ec49538eade5121bc3b7378dad1eb45f489b1d416048bf059f6937c676a31f8348e738af32d9dbb8884b26c901404c00ac07311177864 WHIRLPOOL 581cdc126f6ee8bdeb9eecbe98bc7caaf529362fc1ab74ce4a0d9400de2976680ae4e3bcfb6446947293c2271d7c3bbaec5c70582fc09be7751355901aca1b1c
+MISC ChangeLog 63710 SHA256 a7525ce594bd553bb95207d13eff740c49f67014758892e5d6d58fbaf11c440b SHA512 332c11c4d308433fd477af3d544c47d093ee0bcb2b28d2b20c3ad4c623869e41490496f02f1b15e02104c71fc137bfb4ba20d839cfd8b6225c928596847caf13 WHIRLPOOL 3b7509e0a7b61ef684f2e69430144156c9f3cbb951f1629b9a307a809e761fbdd96aea8580e760cd2c425b8f7ae602a570c5c7db7ab716b75b11e591f49854a9
 MISC metadata.xml 2141 SHA256 d21a56048e94d30ebd8ee2a218ec3f19eee184ddb63fd240168348e0e82fde0a SHA512 2140c71ee89ff12de395799cc6f1968a92d9437b2cb7ea0d4aaf553fc073f038cc3c27c522922eb8a7706f40ca8e146de53efa8f57927e6aaf9bca732f9f14fe WHIRLPOOL c2ccc32563da1514c9d58ac358546e719967acd705a4dec862471b0900d3ff55e7d5b718a04e0ca05a70fc5d80ab4309d8fb9b7d86eea0de78531cf77eb0c661
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVKSo/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVK2fdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOfN0P/iCDrA1sYVLuiTO9yw/JrZd5
-HchwBFn4wjXCtfId9OmY4sq5QIVWZq97rzTncw2wsJK717dDIsPkjzIShYh5sud8
-tnMI625F3+xr1pBEW6RFlpxVPXzJkUByG88T9ia2Ym8+cegQ5TflSSrFY9XTnxf2
-rdcw8g7zQcrzesKIjvTjbjtScIGefMEBUXHUG7ujYI65JFtxbvFgSAQE9+CMxJI8
-5EzM0u5OOm/Yb1pMVqFlGSCXvkCigVo5GAAWdXO3Dv82YqkXiwOYYmu+plp04mc+
-dqy2QJquox1WKEPwjFvXZVPVJ0anhqsYexkVGZRjbERpJEBfYSgyzIZEVo1QdpA7
-f8XlCZdbmdFhgcDDn9UV3sQVGT3qTyt3IIX07SivuU6PZOjJTzEVHEUUN8FsOZfY
-rJlPp+Wi4227DJylLbnfXdd5KqsXz/+LwI0Ak7mBtgSxVCQIN2BoPEYe9Dq5iic5
-WijuSL2Vxfe3iCHjepqSlUPAAMYiJIdaQLcZEzt9CHS337Uc+iLLC2XaMl0Cc+rM
-AeWOJQG4qj1oNEAqvRK/tJAcgQFnJxlgw2juHqEFiN1MNTiuY5SLixJ9x3bPUKkN
-+E7CqjvewiIRDZca0A8A77uVYouBOJDzHob7Lu9YarHN65D/GJjfOduRp+BZ4yze
-ZMg2KkWfY2oU7e5/TJCm
-=d3fl
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOZdcQAMWxmEngTvEBwVTJBm/xkhc7
+29BV3ofL8PYdOuWPhF6LseQmh6KRPiiV6K+B5ukjuIvg4feachmWCfX5Gi+NY3st
+LOa79JiUF+juMd0aFb/X+1U0ddVTwvFB1zrYWjMTzW5f/obSDWVjGbVP07NdO4NS
+JCIGdtlhW6WAfBunVeFuWyvuUXOUOj/qWbuNOT9IVvY8tz4Qe75WbnPnbilFzyPb
+4ynOhF3DvamijybePaoT3/rDWoQjBCfJDNvm+xxYphajWqQITmezKCUqbtyD2RNS
+H/la2nWwutpzPL7k4IJxwTXGkc7UoQqKuC3YFbwGjzt51L9STc9XHG/4BlL/QZMM
+egfFEADuTHTM11OMiHc0n5EFAoP7Y2JV/1He7pCuru4WSjXX370mD1cF7NUYUVeJ
+yJq3wtR7+vZ7h1VIPXtsOFM79HfcUS03KEBokIjhPNgGxH7GmyVf8qosQflqCCVq
+3+KcZTyNpbVe/lzxaRg6G3VxEXSaAiq2V5cNQO21Vx9WSV2BMQ7DFcZRb7cXS8uh
+MvjqFg5APAI0umxrOFc9A1lhO6QxZ5bVR/6XIjKWsGtZwXljYoVcbI2DpCAmuAr+
+nMNZVOfOj8TQpgUY0VJd3XW7s9+KuIN/Zstc4Hawvz9ub7Tl4zzX7NE23QOcjv8C
+uKsbSgPAIIBNeo/A/pnj
+=ySj9
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index b3d0e7bed799dc953426c347e7aa582565507ee9..edf705430420c58cfba56f6272c2f0502385ef97 100644 (file)
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.162 2015/04/11 14:05:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.163 2015/04/13 06:53:14 mgorny Exp $
 
 EAPI=5
 
@@ -98,7 +98,7 @@ DEPEND="${COMMON_DEPEND}
        ia64? ( >=sys-kernel/linux-headers-3.9 )
        virtual/pkgconfig
        doc? ( >=dev-util/gtk-doc-1.18 )
-       gnuefi? ( sys-boot/gnu-efi )
+       gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
        python? ( dev-python/lxml[${PYTHON_USEDEP}] )
        terminal? ( media-fonts/unifont[utils(+)] )
        test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
@@ -252,8 +252,6 @@ multilib_src_configure() {
 
                # TODO: we may need to restrict this to gcc
                EFI_CC="$(tc-getCC)"
-               --with-efi-libdir="${EPREFIX}/usr/lib"
-               --with-efi-ldsdir="${EPREFIX}/usr/lib"
 
                # dbus paths
                --with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d"