Import live ebuild too, add xkeyboard-config dependency per bug #469770.

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64

4 files changed, 181 insertions, 26 deletions

diff --git a/sys-apps/kmscon/ChangeLog b/sys-apps/kmscon/ChangeLog
index ec9b41eaa289..31e36aa9d1c6 100644
--- a/sys-apps/kmscon/ChangeLog
+++ b/sys-apps/kmscon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/kmscon
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmscon/ChangeLog,v 1.1 2013/03/27 04:08:22 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmscon/ChangeLog,v 1.2 2013/06/01 05:24:03 chithanh Exp $
+
+*kmscon-9999 (01 Jun 2013)
+
+  01 Jun 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +kmscon-9999.ebuild, kmscon-7.ebuild:
+  Import live ebuild too, add xkeyboard-config dependency per bug #469770.
 
 *kmscon-7 (27 Mar 2013)
 
diff --git a/sys-apps/kmscon/Manifest b/sys-apps/kmscon/Manifest
index 81f5544e8555..04503fdd991a 100644
--- a/sys-apps/kmscon/Manifest
+++ b/sys-apps/kmscon/Manifest
@@ -1,24 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST kmscon-7.tar.bz2 1341429 SHA256 577d977f66247cfc0e30bb5971fb796bc78a81d8008076ed21b9e6a142dcbed4 SHA512 492b90258cc00bc913daf3e512efcb5c1eab060addac23fe0996b3b117ab2024ecdf6f6401cad0bd70de9849cc1221c833eda686c92d2afb9605b22cb1a5c438 WHIRLPOOL da3c87d6bbb0a8b66b4762344d045bf8c23ee7701c1e9cfad8edee35f6bffb5c6a6ebf77f882f2f9588d53480dd72359a90c9adda5d2862943f7e3a5b4f3984f
-EBUILD kmscon-7.ebuild 3183 SHA256 e68590871a63b1b1228aa5bac9d6eacf5ddebe965ce36217caafcb4aba72c750 SHA512 1c8bf2460b8a5b8537a185b63a8ba1516991c9b285fe9c886386f9af964a775c3e8158c56c39b903f6a006edee4eb32cd68c24f5e502d894f74e0b65775d4195 WHIRLPOOL f0c8a23a8a72889528e9165de054ea806dc7ec90a5ee9709b3d4ee606f5af145ada6efc197df398da63ab3f501a49d1b646ef3bc591ebf491dc6b9151874cfe5
-MISC ChangeLog 343 SHA256 2c8eed8484c5d805ed5aa5a2f0aaf43335c7a0e4bdbf2f3a4dcdddf1b07fca13 SHA512 94c5a890c1987f6841d8ff601e51839946fca8f886e90f8e43e485081e64cf3ab5a19c3fcdf3747ad2075e1c9181c0ae4ec36f5db4b36ba6d1365e406d4542eb WHIRLPOOL fe278fd926d731ad98b9ae59c04c6939da26227a2f61302ece264d37bb0e9ee7a1130c3638bbd2add4d558128ac8817b5b8c4041610a9a4335a884d6e23f2201
+EBUILD kmscon-7.ebuild 3251 SHA256 65e1a09c80c59f7305d0d5194f22ae452bac967beda1fe5dfdda31d66de283a1 SHA512 7546310e0e68cf8d913930a4f6c27d27b13577ac3623e21b308557360369ace1b3eb2108b8cf09e8aa7b4364f3b99e4a1773a2cf025271e051fe7e1bf4ca4b9d WHIRLPOOL d400ff88a6301db5ad7a3210253a4a819b86eec82e22a752b79b6c9b15fe3a6191b1c571913a9522682e59a0a02987cdb0ea5f626f6492a317bb9e450ba72f9b
+EBUILD kmscon-9999.ebuild 3249 SHA256 d10dc5c087c148d579c7e6b803eebdd2f612d75718137269ed3666fa1e87b881 SHA512 ef039c7e7e4d3e345be3e020444283a6ba4b6dbc27cc2406ede0138a0781bcbbd6ea80f8d2eeedd3b3a17d9df2f8b51abb64cec751fa9e3d0131cdb588c4d8a7 WHIRLPOOL 193248b2388dbd14899d803e72aea0a07f24dbbc34dbfe553ce54d5d7b68e9a6998012e80653135a6e824c003197e43b616a0aa8b4b0f08a7cee89fde5944057
+MISC ChangeLog 558 SHA256 c5b1590132ea710685f5e88c7efdd3918363ef8b38b47465181572ff4d24ff84 SHA512 8929a804b7328277b698497dad5084994418b90f99670aa4afbf1b001352150e907437ca30fe31f871382b6d6048cd1766ec1d68fad59e745c59fbe1707eee45 WHIRLPOOL a2e8fc09b947c43fc8fdfdf1aef95559b1ccd1e6412e668384de0d75e0abc9a55481df3d708e0b88fcb01227423f3a82b93c3814d8716a4c9219cb452ad25715
 MISC metadata.xml 579 SHA256 0aa56faf070213e279febd156c3718996b724ebc2561554a457a1502f75a303c SHA512 fc93c917df16f3a1be7a1d28ff1f4ac4e21ecea7e8438e804d50c66900e068b07a5f22bc423693dbc6acbd5220e286dc4a04178d9edd3bdb4a20cbec5a81288e WHIRLPOOL 7c7527caa9f1de01c5efb4757ac459f56445e72f8403d04fba6b242f35051acd0ba77bdfd27e113b099fb985e540d38777c6412f90fe5e801044bd3f966ce3b3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJRUnC2AAoJEOf+E+/4L5LmOdQP/A0B0R2Ha2Pr3c3dAWo/cwcF
-T1gOL7sqCa12ONMCWwtvuxMyvYeCtGT7y4yPJJVX3L25XQV7r6xUK4ZhCWYvbbZW
-4MhPY+8Gs2Hm8rDT1SrDDry7ffzyDsS+6P4RzFlOV9NnS0bgF3BSqQGB8eD79OJX
-9Ja4PFHJ0dI1VzV1gWZ3VmQtlD2iKmW1ntU4WGM1XYFzj0RcpqRZf+mW2zOmKBtg
-zueGiiJABsW1vAtTJUwO1ChV8sVwGX97h9zMNrzV7EDH4ppyWkDn2XlVxs6yAitd
-3mQkHQKH+uqcsEdLnozzqwuVeQ+rF4w4RgSXHEuiMeIt0aztlySUsdSSXuiY5Hxk
-U940o5IYbo9QuJI794wkgabhg1mZ0/u0F4j3TjSkdD5d1n7H69seLvfVh5s5yFsI
-0uGVBeMdvW1aQJOQMNZJqblQYPuSC7CLrAXoXRQif2KHu3g0YjafbuUTEoi0xPDf
-kUV33aoljh1HTlVZD/sQY/+qgRlvtOD7Ie3yYWRO0W3T+dAg+iyMww/mAthvT/D/
-24XYUr0F0a2Ihlw9vYHTcMH4DzEsuxP+IKVWNBRCDlOONhepQ+WgcsCXOG7IH2ug
-Pq6Z+66/1KcjpAHYdGwQ8wHMbs+j5OFVOLBQM5R2lmxwyz+ciSZejKhgVYmL/jyP
-lF4cITMipjgMgH6tJBxv
-=L3AB
------END PGP SIGNATURE-----
diff --git a/sys-apps/kmscon/kmscon-7.ebuild b/sys-apps/kmscon/kmscon-7.ebuild
index ee71011fbc6b..6f234e61820b 100644
--- a/sys-apps/kmscon/kmscon-7.ebuild
+++ b/sys-apps/kmscon/kmscon-7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmscon/kmscon-7.ebuild,v 1.1 2013/03/27 04:08:22 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmscon/kmscon-7.ebuild,v 1.2 2013/06/01 05:24:03 chithanh Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ SLOT="0"
 IUSE="cairo dbus debug doc +drm +fbdev +gles2 multiseat +optimizations +pango pixman
 static-libs systemd truetype udev +unicode wayland"
 
-RDEPEND="
+COMMON_DEPEND="
 	dev-libs/glib:2
 	>=virtual/udev-172
 	x11-libs/libxkbcommon
@@ -42,7 +42,9 @@ RDEPEND="
 	cairo? ( x11-libs/cairo )
 	pixman? ( x11-libs/pixman )
 	wayland? ( dev-libs/wayland )"
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xkeyboard-config"
+DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	x11-proto/xproto
 	doc? ( dev-util/gtk-doc )"
diff --git a/sys-apps/kmscon/kmscon-9999.ebuild b/sys-apps/kmscon/kmscon-9999.ebuild
new file mode 100644
index 000000000000..b777022409e0
--- /dev/null
+++ b/sys-apps/kmscon/kmscon-9999.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmscon/kmscon-9999.ebuild,v 1.1 2013/06/01 05:24:03 chithanh Exp $
+
+EAPI=5
+
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-2
+	EGIT_REPO_URI="
+				git://people.freedesktop.org/~dvdhrm/${PN}
+				git://github.com/dvdhrm/${PN}.git
+				git://github.com/dvdhrm/${PN}.git"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit eutils autotools systemd flag-o-matic ${scm_eclass}
+
+DESCRIPTION="KMS/DRM based virtual Console Emulator"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/kmscon"
+
+LICENSE="MIT LGPL-2.1 BSD-2"
+SLOT="0"
+IUSE="cairo dbus debug doc +drm +fbdev +gles2 multiseat +optimizations +pango pixman
+static-libs systemd truetype udev +unicode wayland"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	>=virtual/udev-172
+	x11-libs/libxkbcommon
+	dbus? ( sys-apps/dbus )
+	drm? ( x11-libs/libdrm
+		>=media-libs/mesa-8.0.3[egl,gbm] )
+	truetype? ( media-libs/freetype:2 )
+	gles2? ( >=media-libs/mesa-8.0.3[gles2] )
+	pango? ( x11-libs/pango )
+	systemd? ( sys-apps/systemd )
+	udev? ( virtual/udev )
+	cairo? ( x11-libs/cairo )
+	pixman? ( x11-libs/pixman )
+	wayland? ( dev-libs/wayland )"
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xkeyboard-config"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto
+	doc? ( dev-util/gtk-doc )"
+
+REQUIRED_USE="gles2? ( drm )
+	multiseat? ( systemd )"
+
+# args - names of renderers to enable
+renderers_enable() {
+	if [[ "x${RENDER}" == "x" ]]; then
+		RENDER="$1"
+		shift
+	else
+		for i in $@; do
+			RENDER+=",${i}"
+		done
+	fi
+}
+
+# args - names of font renderer backends to enable
+fonts_enable() {
+	if [[ "x${FONTS}" == "x" ]]; then
+		FONTS="$1"
+		shift
+	else
+		for i in $@; do
+			FONTS+=",${i}"
+		done
+	fi
+}
+
+# args - names of video backends to enable
+video_enable() {
+	if [[ "x${VIDEO}" == "x" ]]; then
+		VIDEO="$1"
+		shift
+	else
+		for i in $@; do
+			VIDEO+=",${i}"
+		done
+	fi
+}
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	# Video backends
+
+	if use fbdev; then
+		video_enable fbdev
+	fi
+
+	if use drm; then
+		video_enable drm2d
+	fi
+
+	if use gles2; then
+		video_enable drm3d
+	fi
+
+	# Font rendering backends 
+
+	if use unicode; then
+		fonts_enable unifont
+	fi
+
+	if use truetype; then
+		fonts_enable freetype2
+	fi
+
+	if use pango; then
+		fonts_enable pango
+	fi
+
+	# Console rendering backends
+
+	renderers_enable bbulk
+
+	if use gles2; then
+		renderers_enable gltex
+	fi
+
+	if use cairo; then
+		renderers_enable cairo
+	fi
+
+	if use pixman; then
+		renderers_enable pixman
+	fi
+
+	# kmscon sets -ffast-math unconditionally
+	strip-flags
+
+	# xkbcommon not in portage
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable udev hotplug) \
+		$(use_enable dbus eloop) \
+		$(use_enable debug) \
+		$(use_enable optimizations) \
+		$(use_enable multiseat multi-seat) \
+		$(use_enable wayland wlterm) \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--with-video=${VIDEO} \
+		--with-fonts=${FONTS} \
+		--with-renderers=${RENDER} \
+		--with-sessions=dummy,terminal \
+		--enable-kmscon
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use systemd; then
+		systemd_dounit "${S}/docs"/kmscon{,vt@}.service
+	fi
+}