Eliminate unifont dependency by fetching a copy in SRC_URI.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 22 insertions, 11 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 4054ebc6de55..13b7bf51d27a 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,10 @@
 # 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.382 2015/07/09 02:19:52 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.383 2015/07/10 00:48:16 floppym Exp $
+
+  10 Jul 2015; Mike Gilbert <floppym@gentoo.org> systemd-222.ebuild,
+  systemd-9999.ebuild:
+  Eliminate unifont dependency by fetching a copy in SRC_URI.
 
 *systemd-222 (09 Jul 2015)
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index e9f64ec9e5fb..d54b5ca42e53 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -18,19 +18,20 @@ DIST systemd-220.tar.xz 4036028 SHA256 3659588c40221ee7257502c0735491f72796dbe17
 DIST systemd-221.tar.xz 4010048 SHA256 085e088650afbfc688ccb13459aedb1fbc7c8810358605b076301f472d51cc4f SHA512 db2552674f1d656e0398b461b42738fcad40dd64700700a7041650581981e7ac563652ef45b859f73a74058bf0a428c26402b5356cfe50b59c20c2678441ab0f WHIRLPOOL 00939e03a780972ef9ce3a8833ed150c067d86094ea11b92baba42469969653ed8f156744fcde1809df6b127f48e82d73391aec9340146829d83312a40cfb138
 DIST systemd-222.tar.gz 4015599 SHA256 b49f51f9855127987adc98aad3b6d608e4e53eaa029b629f2ea2089ce0234f34 SHA512 83f0acf0ca90c89c902c268af6eef4b61380a30380013cbe89c929357959f51682cd3961a6a4f772abc09d5ca09404ae290edf2c3253fab1b20dc2b5b3ecde47 WHIRLPOOL dd0151034de374b072e70448e7a9ff47693df0190e8a2a11488593400d3d7e53e0a91d86037d027c750584089e6c68e58c437647d608a72f8826f091e3253879
 DIST systemd.conf.m4-v219 1493 SHA256 90ee489b6e34945e5cda27a269e1247644382084f5a145a2df691282007c6768 SHA512 a117c40229af3ba2a0cec4c3db01728c3cab49bb6403fc84cb34f8a09979d98f7a200cd28bf2bbc7a71cbad856edf31190fba30a9d5810c55911746457bbf31a WHIRLPOOL a1604a4fdf5e2d4a4505252859c64d0a3c131b4bb371cff8c75331438f291f138d2732d939947988ab95b040e377412db84fbf6c45866fee028a2aac70e8eb9f
+DIST unifont-8.0.01.hex.gz 938016 SHA256 f67cffeb5e8a0ce5ad2c19a6f289a4e7c8caa0b8c624368adaf8571994c3ec1c SHA512 23aa0228da186b2f6575c1f06101f58713dfb98193ad3772405668d4e3e18d4c1e0fea40639b237dd3a5f4dee6dea90aed85fea3c28165fdfeeace79a2059e6f WHIRLPOOL 23069b019ca1aa9e33df4ce7a728d399090670b85e37029d45f9a0125d13f965039c7e5b9cd6bc633ef259780286f0e6a596b410c1fc144f1f1205e69e36c5cb
 EBUILD systemd-216-r3.ebuild 15334 SHA256 0f324722d2af3bf4099c775060ec2c0e239dca384561079e7169b48ef645bb17 SHA512 4a429fa8c30f10f3285ebdee1673a856da8a5c824e9a3e30561e722c02b0f347c33f473a6f2c67be537a9b8e75b33ce6be785616c8f2c5d72c2a84dcff171ec1 WHIRLPOOL 6e1e740a543414fdedb5f7f35117efad45ad93590e47d86778d2702e83f39e31d177afc8f429f940b0fd40a8b4e370edd62a300dd1cdb7308c037139d60a276e
 EBUILD systemd-218-r3.ebuild 14306 SHA256 0d263b166e5ce14b0c4a5db6b3880041ab575de611ff5c5db728a0289fc19537 SHA512 27399eef7ac2ce377b65bbc5a70ccfb6f651d2db7a927a96e5ce47945fe7a396e073055326ad7ecceb13740877e42d902fbb339768c49a0655e62c040150e6e5 WHIRLPOOL 9fa3ba69b214e17f82369504a1176fcc16624ae343db11e8f1293aa0f3093527a5a41d6d63f343cc8c821eccc4960e1a4de7af1492bcde81e463983fba3ba673
 EBUILD systemd-219_p112.ebuild 14732 SHA256 45e93b2514b8bd927cb568161a4cc14d1f23ea1e7ad01ec792cf9997ce271fe6 SHA512 db3abc0d38f258edead932ed016436e96a0ac0343e736040167f34428c47f63aee97b69814336c0680801f3c2aff7948db31df5455069408deb42c289d98142a WHIRLPOOL c7ee8a6eca887ee2a769154bde19a3d2b9ad64c53cf7c14aaf9ea4df57e5fd42f12eebfa71c30bbf07420c5366c9322c3afad473bb6a791abce7aa4baaf42a66
 EBUILD systemd-220-r2.ebuild 15427 SHA256 efe7bd19caaca0f851cade9ed42932b76ef3a53dafa24fcc1ae852b7f30ce0d6 SHA512 0e8cfb794a4aaf07b50f1912622958ff97f927e3aaf3522fde6251fff467f9cef2c769a76c4132fbdeb3ca7a758588321131763b5ae5d300bddaf3f1108471b8 WHIRLPOOL e1164b81c0d765183310146dae724a11a572da1a6edc0cc970dbc0c6613fd761a1d6a06ecbd45f967720400995fce6732aaaefc9f202325ca08274650bf58d90
 EBUILD systemd-221.ebuild 14778 SHA256 3d07e2eac970058c8a79426bf4fdb7eab4090c44b01c7d872cfa90de64adad1e SHA512 2bdbad8eff3ffbc88696463c1096be203ff9b938514c9a185f042e128f6bd915d4b97e4eb3ee1d976b3e86901f8f029e65211dc5899e969ee4f32574f1eec8b4 WHIRLPOOL c9ea036f2db1941e637f0c3bbb3bc7160514c1886fbd4cac10b75e8c459d4debf019b1a103b3ae03bada83e05cfa6ed028d98567acc95bc683cfc28c5076f499
-EBUILD systemd-222.ebuild 14337 SHA256 d34b4676fbfd1926e774ddcd8fa68acae18bd8323fdef3ca1e529e66cf5e90d9 SHA512 e9b4f2ae3ad395a00a0bd17055bb0ee15cc9458e8f1915d911f32f6b7cab36ba31c9c383468a71d263535a81c3c130a50d0c3825b8779d08c47acf8fe90ea839 WHIRLPOOL dfb7de250b0969e1d22eebbbb6dd751977d103230ecb6bf3715b99cf0269a91aa2cd4d5e2acc5b08faf57d66bfff3c40f0e3de55c8247b4ecbda02c1def05ef6
-EBUILD systemd-9999.ebuild 14340 SHA256 340dcc3444ab91c3c0ee21694a4fbb93ab21efda1a672b44b7f6bee6d2903bad SHA512 f05e74744f306afd7d4e0b5f0a01debcb350eb935c8be0d11b9d6499c17fddf2d53c192b696dfd518e97dbf9dce1b224d78ed10586af52a1de58b2aec6f60b73 WHIRLPOOL c2b2ce841345adfd0ef2c9f3d6c3350aa609069a5e1ca0064f9f761dc411dc13b63b83573c8f432a9066f60eba4e3db55eac15c83588470ad2110a1a0ea11853
-MISC ChangeLog 67292 SHA256 23e0569fe078e2f09792e1eff6a37d63dfecbe7ae6fd6c61a4ced7662d9739a9 SHA512 81d833c6c130ed86792399035ea644c36edf1840b264703c801dda88a4a44fc20ad61b16275d2727b44ca78450d19fde3395b97ed92553d6493faf77246ca155 WHIRLPOOL 7d136c2600f6b46552bd457271a8ba6d1b73ad9b4b66abb6833f8b41f061401e26664c30171d1679cac376bf4e659649819b8de45521124071ea8e6679e51b42
+EBUILD systemd-222.ebuild 14498 SHA256 0c9aeead80172bade664e2b97ae186d4a2102d7b4022f31c0ceb42f4479bbb5b SHA512 101c084a35207798181cb530fadfc4a5bbaa94a818e8bcde785dc2337ca4d942832d860eaa1f5098557fbed54d4796a68805aaa2e087f8dd19889918bedc66b3 WHIRLPOOL 590e946d47c9ad5b2a834c78642586f54c3af98937bec6ce91a430ec2feb1222afba8a0e9b77df52ce11854e272922e1ea3d6302a173b0cf4ea87558834bf006
+EBUILD systemd-9999.ebuild 14501 SHA256 d4b7c6d1da5d96eed63e7fabfb47e9356f81704d739d399adbbb7d052c50d949 SHA512 0a058e445c32d6a3ce8313ccc86b9b7c156294b97bb93b5b14d7d253df505e9d3e05af3005fd7ab84797444fe7406e28a62b7fc926c7b2f6324746db47285654 WHIRLPOOL 321cd9e50ed3649a6f5f4b8682debb937d1fd0dd6a946b77961bf6c690e586dbbf054c455c2fa794243ed0bde92d7c9ae43975fa59d60d16043c16c296ef865b
+MISC ChangeLog 67447 SHA256 a46be3c7c1c55b6db5974cf2d311263d0c6b6e12d4e99b4a0a7091c457c71d6b SHA512 1e80074b03226bad7ab5f3cca1111c616792561e755bfb978e8167d8c8fa590b08ae523f5d462511ca57e0e8bbccd1e3a32dfe010c8dae3bee9ffbb7e978717a WHIRLPOOL 785a4ad0c79211b0fa6ed030ea241b0151989127972a0e68e252c53585b6b068caa0f36d927f21ae3428c83eb2a3af5decf1362567568d5add126ac4a77d2599
 MISC metadata.xml 2141 SHA256 d21a56048e94d30ebd8ee2a218ec3f19eee184ddb63fd240168348e0e82fde0a SHA512 2140c71ee89ff12de395799cc6f1968a92d9437b2cb7ea0d4aaf553fc073f038cc3c27c522922eb8a7706f40ca8e146de53efa8f57927e6aaf9bca732f9f14fe WHIRLPOOL c2ccc32563da1514c9d58ac358546e719967acd705a4dec862471b0900d3ff55e7d5b718a04e0ca05a70fc5d80ab4309d8fb9b7d86eea0de78531cf77eb0c661
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlWd2koACgkQRxvnM+8pGj+gxwEA2UGBD/6kHf6xOvp0PE4klkq0
-evKDxRnfVsmEmM03QTgA/2pwCY5KRZAnWCnL6EmKvpRyJCq9RKA8yGfE79M07wgU
-=I7s9
+iF4EAREIAAYFAlWfFlEACgkQRxvnM+8pGj+q2wEA0HqPiYbzaoOAgVgG5/aOBIwY
+/L1cXiKwLrQ7fvwKkq0BALxyFlZjFQPtQds6Rrj2pTBWvwXniE7xxiogDvOTC8By
+=DPac
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-222.ebuild b/sys-apps/systemd/systemd-222.ebuild
index ac1a017cb71d..7c461028ef96 100644
--- a/sys-apps/systemd/systemd-222.ebuild
+++ b/sys-apps/systemd/systemd-222.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-222.ebuild,v 1.1 2015/07/09 02:19:52 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-222.ebuild,v 1.2 2015/07/10 00:48:16 floppym Exp $
 
 EAPI=5
 
@@ -15,6 +15,8 @@ else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ia64 ~x86"
 fi
+UNIFONT=unifont-8.0.01
+SRC_URI+=" terminal? ( http://unifoundry.com/pub/${UNIFONT}/font-builds/${UNIFONT}.hex.gz )"
 
 inherit autotools-utils bash-completion-r1 linux-info multilib \
 	multilib-minimal pam python-any-r1 systemd toolchain-funcs udev \
@@ -96,7 +98,7 @@ DEPEND="${COMMON_DEPEND}
 	ia64? ( >=sys-kernel/linux-headers-3.9 )
 	virtual/pkgconfig
 	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-	terminal? ( ${PYTHON_DEPS} media-fonts/unifont[utils(+)] )
+	terminal? ( ${PYTHON_DEPS} )
 	test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
 
 if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
@@ -225,6 +227,7 @@ multilib_src_configure() {
 		$(multilib_native_use_enable selinux)
 		$(multilib_native_use_enable terminal)
 		$(multilib_native_use_with terminal python)
+		$(multilib_native_use_with terminal unifont "${WORKDIR}/${UNIFONT}.hex")
 		$(multilib_native_use_enable test tests)
 		$(multilib_native_use_enable test dbus)
 		$(multilib_native_use_enable xkb xkbcommon)
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 62029e2a43de..8ca0d30ec10e 100644
--- 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.175 2015/07/09 02:19:52 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.176 2015/07/10 00:48:16 floppym Exp $
 
 EAPI=5
 
@@ -15,6 +15,8 @@ else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ia64 ~x86"
 fi
+UNIFONT=unifont-8.0.01
+SRC_URI+=" terminal? ( http://unifoundry.com/pub/${UNIFONT}/font-builds/${UNIFONT}.hex.gz )"
 
 inherit autotools-utils bash-completion-r1 linux-info multilib \
 	multilib-minimal pam python-any-r1 systemd toolchain-funcs udev \
@@ -96,7 +98,7 @@ DEPEND="${COMMON_DEPEND}
 	ia64? ( >=sys-kernel/linux-headers-3.9 )
 	virtual/pkgconfig
 	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-	terminal? ( ${PYTHON_DEPS} media-fonts/unifont[utils(+)] )
+	terminal? ( ${PYTHON_DEPS} )
 	test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
 
 if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
@@ -225,6 +227,7 @@ multilib_src_configure() {
 		$(multilib_native_use_enable selinux)
 		$(multilib_native_use_enable terminal)
 		$(multilib_native_use_with terminal python)
+		$(multilib_native_use_with terminal unifont "${WORKDIR}/${UNIFONT}.hex")
 		$(multilib_native_use_enable test tests)
 		$(multilib_native_use_enable test dbus)
 		$(multilib_native_use_enable xkb xkbcommon)