floppym 15/07/10 00:48:16 Modified: systemd-222.ebuild systemd-9999.ebuild ChangeLog Log: Eliminate unifont dependency by fetching a copy in SRC_URI. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path 1.2 sys-apps/systemd/systemd-222.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-222.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-222.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-222.ebuild?r1=1.1&r2=1.2 Index: systemd-222.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-222.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- systemd-222.ebuild 9 Jul 2015 02:19:52 -0000 1.1 +++ systemd-222.ebuild 10 Jul 2015 00:48:16 -0000 1.2 @@ -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 @@ 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 @@ 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_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) 1.176 sys-apps/systemd/systemd-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.176&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.176&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?r1=1.175&r2=1.176 Index: systemd-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- systemd-9999.ebuild 9 Jul 2015 02:19:52 -0000 1.175 +++ systemd-9999.ebuild 10 Jul 2015 00:48:16 -0000 1.176 @@ -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 @@ 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 @@ 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_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) 1.383 sys-apps/systemd/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.383&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.383&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.382&r2=1.383 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v retrieving revision 1.382 retrieving revision 1.383 diff -u -r1.382 -r1.383 --- ChangeLog 9 Jul 2015 02:19:52 -0000 1.382 +++ ChangeLog 10 Jul 2015 00:48:16 -0000 1.383 @@ -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 <[email protected]> systemd-222.ebuild, + systemd-9999.ebuild: + Eliminate unifont dependency by fetching a copy in SRC_URI. *systemd-222 (09 Jul 2015)
