[gentoo-commits] proj/x11:master commit in: profiles/, dev-libs/weston/, dev-libs/wayland/, dev-libs/weston/files/

[gentoo-commits] proj/x11:master commit in: profiles/, dev-libs/weston/, dev-libs/wayland/, dev-libs/weston/files/

[Matt Turner]

commit:     0ae1e6b57cf93579b34e93b9b69eb27b4bad8fd0
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sun Aug 30 00:47:02 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 00:47:02 2015 +0000
URL:        https://gitweb.gentoo.org/proj/x11.git/commit/?id=0ae1e6b5

dev-libs/wayland+weston: Delete (moved to main tree)

 dev-libs/wayland/metadata.xml        |   5 --
 dev-libs/wayland/wayland-9999.ebuild |  62 --------------
 dev-libs/weston/files/README.gentoo  |   9 --
 dev-libs/weston/metadata.xml         |  25 ------
 dev-libs/weston/weston-9999.ebuild   | 160 -----------------------------------
 profiles/package.mask                |   2 -
 6 files changed, 263 deletions(-)

diff --git a/dev-libs/wayland/metadata.xml b/dev-libs/wayland/metadata.xml
deleted file mode 100644
index 01c4c00..0000000
--- a/dev-libs/wayland/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-</pkgmetadata>

diff --git a/dev-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild
deleted file mode 100644
index 45acdef..0000000
--- a/dev-libs/wayland/wayland-9999.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${PN}"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-	AUTOTOOLS_AUTORECONF=1
-fi
-
-inherit autotools-multilib toolchain-funcs $GIT_ECLASS
-
-DESCRIPTION="Wayland protocol libraries"
-HOMEPAGE="http://wayland.freedesktop.org/"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="http://wayland.freedesktop.org/releases/${P}.tar.xz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="doc static-libs"
-
-RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? (
-		>=app-doc/doxygen-1.6[dot]
-		app-text/xmlto
-		>=media-gfx/graphviz-2.26.0
-		sys-apps/grep[pcre]
-	)
-	virtual/pkgconfig"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable doc documentation)
-	)
-	if tc-is-cross-compiler ; then
-		myeconfargs+=( --disable-scanner )
-	fi
-	if ! multilib_is_native_abi; then
-		myeconfargs+=( --disable-documentation )
-	fi
-
-	autotools-multilib_src_configure
-}
-
-src_test() {
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	autotools-multilib_src_test
-}

diff --git a/dev-libs/weston/files/README.gentoo b/dev-libs/weston/files/README.gentoo
deleted file mode 100644
index ed8c5c3..0000000
--- a/dev-libs/weston/files/README.gentoo
+++ /dev/null
@@ -1,9 +0,0 @@
-For running Weston you need to have $XDG_RUNTIME_DIR in your environment,
-directory must exist and have correct permissions. If you are not using systemd,
-it will not be created automatically, you can create it using your shell,
-add these lines to ~/.bash_profile:
-
-# wayland
-export XDG_RUNTIME_DIR=/tmp/.runtime-${USER}
-mkdir -p "${XDG_RUNTIME_DIR}"
-chmod 0700 "${XDG_RUNTIME_DIR}"

diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
deleted file mode 100644
index be0b9a0..0000000
--- a/dev-libs/weston/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-<use>
-	<flag name='colord'>Allow setting color managment</flag>
-	<flag name='drm'>Enable drm compositor support</flag>
-	<flag name='editor'>Install wayland-editor example application</flag>
-	<flag name='egl'>Enable egl acceleration</flag>
-	<flag name='fbdev'>Enable fbdev compositor support</flag>
-	<flag name='gles2'>Use GLESv2 cairo instead of full GL</flag>
-	<flag name='headless'>Headless backend and a noop renderer, mainly for testing purposes</flag>
-	<flag name='ivi'>Enable the IVI shell</flag>
-	<flag name='launch'>Install weston-launch utility</flag>
-	<flag name='rdp'>Enable Remote Desktop Protocol compositor support</flag>
-	<flag name='resize-optimization'>Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi</flag>
-	<flag name='rpi'>Raspberry Pi GPU support</flag>
-	<flag name='screen-sharing'>Enable screen-sharing through RDP</flag>
-	<flag name='tablet'>Enable interface for tablets</flag>
-	<flag name='unwind'>Enable libunwind usage for backtraces</flag>
-	<flag name='view'>Install wayland-view example application</flag>
-	<flag name='wayland-compositor'>Enable Wayland compositor support</flag>
-	<flag name='xwayland'>Enable ability support native X11 applications</flag>
-</use>
-</pkgmetadata>

diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
deleted file mode 100644
index 06fe4da..0000000
--- a/dev-libs/weston/weston-9999.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-VIRTUALX_REQUIRED="test"
-RESTRICT="test"
-
-inherit autotools readme.gentoo toolchain-funcs virtualx $GIT_ECLASS
-
-DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="http://wayland.freedesktop.org/"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="http://wayland.freedesktop.org/releases/${P}.tar.xz"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~arm-linux"
-IUSE="colord dbus +drm +egl editor examples fbdev gles2 headless ivi +opengl rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor +X xwayland"
-
-REQUIRED_USE="
-	drm? ( egl )
-	egl? ( || ( gles2 opengl ) )
-	gles2? ( !opengl )
-	screen-sharing? ( rdp )
-	test? ( X )
-	wayland-compositor? ( egl )
-"
-
-RDEPEND="
-	>=dev-libs/libinput-0.8.0
-	>=dev-libs/wayland-1.7.0
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	media-libs/libwebp:0=
-	virtual/jpeg
-	>=x11-libs/cairo-1.11.3[gles2(-)?,opengl?]
-	>=x11-libs/libdrm-2.4.30
-	x11-libs/libxkbcommon
-	x11-libs/pixman
-	x11-misc/xkeyboard-config
-	fbdev? (
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	colord? ( >=x11-misc/colord-0.1.27 )
-	dbus? ( sys-apps/dbus )
-	drm? (
-		media-libs/mesa[gbm]
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	egl? (
-		media-libs/glu
-		media-libs/mesa[gles2,wayland]
-	)
-	editor? ( x11-libs/pango )
-	gles2? (
-		media-libs/mesa[wayland]
-	)
-	opengl? (
-		media-libs/mesa[wayland]
-	)
-	rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 )
-	rpi? (
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	systemd? (
-		sys-auth/pambase[systemd]
-		sys-apps/systemd[pam]
-	)
-	launch? ( sys-auth/pambase )
-	unwind? ( sys-libs/libunwind )
-	X? (
-		x11-libs/libxcb
-		x11-libs/libX11
-	)
-	xwayland? (
-		x11-base/xorg-server[wayland]
-		x11-libs/cairo[xcb]
-		x11-libs/libxcb
-		x11-libs/libXcursor
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	if [[ ${PV} = 9999* ]]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myconf
-	if use examples || use gles2 || use test; then
-		myconf="--enable-simple-clients
-			$(use_enable egl simple-egl-clients)"
-	else
-		myconf="--disable-simple-clients
-			--disable-simple-egl-clients"
-	fi
-
-	if use gles2; then
-		myconf+=" --with-cairo=glesv2"
-	elif use opengl; then
-		myconf+=" --with-cairo=gl"
-	else
-		myconf+=" --with-cairo=image"
-	fi
-
-	econf \
-		$(use_enable examples demo-clients-install) \
-		$(use_enable fbdev fbdev-compositor) \
-		$(use_enable dbus) \
-		$(use_enable drm drm-compositor) \
-		$(use_enable headless headless-compositor) \
-		$(use_enable ivi ivi-shell) \
-		$(use_enable rdp rdp-compositor) \
-		$(use_enable rpi rpi-compositor) \
-		$(use_enable wayland-compositor) \
-		$(use_enable X x11-compositor) \
-		$(use_enable launch weston-launch) \
-		$(use_enable colord) \
-		$(use_enable egl) \
-		$(use_enable unwind libunwind) \
-		$(use_enable resize-optimization) \
-		$(use_enable screen-sharing) \
-		$(use_enable suid setuid-install) \
-		$(use_enable xwayland) \
-		$(use_enable xwayland xwayland-test) \
-		${myconf}
-}
-
-src_test() {
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	cd "${BUILD_DIR}" || die
-	Xemake check
-}
-
-src_install() {
-	default
-
-	readme.gentoo_src_install
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 0137b16..5f34957 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,7 +1,5 @@
 # Don't let people install these accidentally
 =dev-libs/libevdev-9999
-=dev-libs/wayland-9999
-=dev-libs/weston-9999
 =x11-apps/mkfontdir-9999
 =x11-apps/mkfontscale-9999
 =x11-apps/radeontop-9999