gentoo resync : 02.06.2018

5 files changed, 25 insertions, 147 deletions

diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 07153831bcb8..664066c46d4f 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -1,10 +1,7 @@
 AUX openbox-3.5.2-gnome-session.patch 574 BLAKE2B 64d1d141245172140c16e7d4bee91959f04b625eaf6c67587e77ac1d3c693ad177db88aa9bb858aab80422313a7709ec48daa594d29b14fd8f9805c1160e98a6 SHA512 35d36dd2ddef05e21491df75a1d14c3d26dd17a8da79577d06fb3b7ddf6a179c7e23bb777e4cbdaa4bb4ab745db023981645f3dbe4dcf75c7b4d5f46e18b96c8
-DIST openbox-3.5.2.tar.gz 972751 BLAKE2B 67fa52c595ac107906b879bc98cbf057ef38432686d4fe138b3b13c39e640719a2afd1686847d8ba50548eb8fbd6ea9b92cbbc35ce692d61135c8d35f8f6a907 SHA512 89c58364bc482f2b098341e28b2bbab69a791430ff8924dc0dd6fe56aabadde916d42a4e7dfb47cab21afebd747698e106a19e852444d2ede05e72ef423df09d
 DIST openbox-3.6.1.tar.gz 962665 BLAKE2B 1c0288137d7b02d443c384f970cd9a3f4d5d5585989917ac6ae8cf492e045dc086650c245907e168bc7b6d0ce701339854a5d94ad510823141cc78e28c1e13c5 SHA512 5e6f4a214005bea8b26bc8959fe5bb67356a387ddd317e014f43cb5b5bf263ec617a5973e2982eb76a08dc7d3ca5ec9e72e64c9b5efd751001a8999b420b1ad0
-DIST openbox-3.6.tar.gz 963207 BLAKE2B cbc29011fea9157af62c87a68e1cf4c31b474a5520c995bca360f2db83fe0957716bbf5af916bf7d5d0f677192d07d4cb07ad35f7b79ede548342f2805add533 SHA512 7f158a5236dcba5ec3c0e4fb5d1a5cabbd956d4125f19dfdb0594f5ded52545078d85ab645589ec3400a5306f63b43db5ee1ae26e3683141ee47f1b406d9788b
 DIST surreal-gentoo.tar.gz 13410 BLAKE2B e7d902278004785c68a2e5aa02aa326cee1ef04fe964fce283afde00cb668b06d5d8461207ef9571aa402b960ec16bdff6bf11cf38ca9a76335ced173592ffce SHA512 dd43cb78e5e33345767edad22d0470765ac9eeae02bbad0acd8098bc096c15a166bf651493d12a5953bc043c9be92e9b160607eafb4723a6bcfc5d1d6fae235e
-EBUILD openbox-3.5.2-r1.ebuild 2663 BLAKE2B 1088d3f938fba0f4aaa54eb92f6ee70925798bf4009270f73cf49db27e1b492fb820165ef0ff11dde24476b15a7a5ba1a7bf912e7cd4381cefae07b2aed67de1 SHA512 3f7adbd4cc1ebbdc7b6d78204754e15658437245226619b004173e7e466933fcfdfcc99a9965150733baeb1848895288b58a62a4dc12d9d8988d7306576dd0e6
-EBUILD openbox-3.6.1.ebuild 2697 BLAKE2B 37fdbe2e77250e589df602f8dbb9f9e9d21796f261f34ad58b707d82db77789a7a733c01f36eeb44c1f3947a88177369dfdf5280e3ca6aa72a2453b60ba720f7 SHA512 785eb20cc0b1b09635b5d8cd6c406ecb354a16a5f7c85e014aaa8fe09d15251cb0a69b1bbb14e7d44e1c9f098301ad9ac19f3e4f7855af65106feb16b643d0ed
-EBUILD openbox-3.6.ebuild 2671 BLAKE2B 5fb2a1bcc642d782e19735e06f84edd18cd0eac2377a13f1ad5b1d0793667515433d36bbd217f5a6837b5caa70c2d506984ee3338cb7de632a5ce253e87dfb0d SHA512 182f43c9154606e323e2723147d70f9b2ba163fbb2d405125377d0f026807baf341d10b1bcc1be6d09fc3bffb60289230c98ae0657601bc88a8e2a7735f6e5f3
-EBUILD openbox-9999.ebuild 2624 BLAKE2B 3ee8bc1671baed6eb0b04d54e575e43af6066f7c4d7bc027adc809e7564c66c15cda6844b47923779deb4be0459ab249e4b7cf15414d663a2c7b7cf4eb03be99 SHA512 82cf7cbc59166cd540e82fa403cb7bfa89071e97f0c0c2e0673a65af9a5251550d627c98359b275d5e68a213ca9a20e57cf5354ddaedca2fdc1e2266bae41d18
+EBUILD openbox-3.6.1-r1.ebuild 2605 BLAKE2B b60b14e16fd0d40d49befaa529c9162271c52aa75917a969611629595f3586f94c719c682f7efde10f9f93161b9ea232fec940938e388461b01370a7db567ee9 SHA512 825f0c2accecc87a0ca405da1ae9879b85effecd74caada53b63b8b3169ee07edc3f76dbde375047e613dbf4f2354998bf021a0b661b251cae2484d02ef333a2
+EBUILD openbox-3.6.1.ebuild 2629 BLAKE2B cc85fe51d30ac2777688db61d19d99bb293a00a7302e741049243feecce87dce1cf6d1d01e1b3c26843b048f06094b694542a34535ef9398a6e04c53fad70276 SHA512 eeea5080f4bc1d5813bdd950faa18f4b4d6096e5c0a448818d4b4c8bb2fe9069d45536e20b47d10495a03000f148d783ad5649c38becd85a748ac590eef97da7
+EBUILD openbox-9999.ebuild 2592 BLAKE2B df24be7de6dbca1b8db1cbb2e36d998b4d0a8c160732ef4b91ebb8b2f155c7889fb950d2cfcea8cbff5da1fb612c7ee12b46e714958091a8802aff74e8e14b4b SHA512 e530af462ee7eaedaebf875e38ec3d1ab9b9cfd14a1f08ea9707cd7c93869a7ba1b26372c4b88c635307943956e0d4fed6debe549d548e0258d802139f6ce9d5
 MISC metadata.xml 830 BLAKE2B 229d742b61c0557d742a2157121b941ea5e177764d870a6516af17c30802ed891a833e0982a8e82b15f281c33213575d0fcabe265873f78829a2a639dd9ace24 SHA512 879cbe0783337b93847faf36b5475fcc71bcaa80834fd9910bd6a16ce932ed28943f5e027815ee17d2a33806fef8b5445475133dba962d81b90dd823cf352aaf
diff --git a/x11-wm/openbox/openbox-3.5.2-r1.ebuild b/x11-wm/openbox/openbox-3.5.2-r1.ebuild
deleted file mode 100644
index 433a8a577125..000000000000
--- a/x11-wm/openbox/openbox-3.5.2-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit multilib autotools python-r1 eutils
-
-DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
-HOMEPAGE="http://openbox.org/"
-if [[ ${PV} == *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
-	SRC_URI="branding? (
-	https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-	KEYWORDS=""
-
-else
-	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
-	branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="3"
-IUSE="branding debug imlib nls session startup-notification static-libs svg xdg"
-REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/glib:2
-	>=dev-libs/libxml2-2.0
-	>=media-libs/fontconfig-2
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXt
-	>=x11-libs/pango-1.8[X]
-	imlib? ( media-libs/imlib2 )
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	svg? ( gnome-base/librsvg:2 )
-	xdg? (
-		${PYTHON_DEPS}
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-	)
-	"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	use xdg && python_export_best
-	epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch
-	sed -i \
-		-e "s:-O0 -ggdb ::" \
-		-e 's/-fno-strict-aliasing//' \
-		"${S}"/m4/openbox.m4 || die
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable imlib imlib2) \
-		$(use_enable svg librsvg) \
-		$(use_enable startup-notification) \
-		$(use_enable session session-management) \
-		--with-x
-}
-
-src_install() {
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}"
-	fperms a+x /etc/X11/Sessions/${PN}
-	emake DESTDIR="${D}" install
-	if use branding; then
-		insinto /usr/share/themes
-		doins -r "${WORKDIR}"/Surreal_Gentoo
-		# make it the default theme
-		sed -i \
-			-e "/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
-			"${D}"/etc/xdg/openbox/rc.xml \
-			|| die "failed to set Surreal Gentoo as the default theme"
-	fi
-	use static-libs || prune_libtool_files --all
-	if use xdg ; then
-		python_replicate_script "${ED}"/usr/libexec/openbox-xdg-autostart
-	else
-		rm "${ED}"/usr/libexec/openbox-xdg-autostart || die
-	fi
-}
diff --git a/x11-wm/openbox/openbox-3.6.ebuild b/x11-wm/openbox/openbox-3.6.1-r1.ebuild
index 8412487ff4fa..8ad170d1e464 100644
--- a/x11-wm/openbox/openbox-3.6.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 inherit multilib autotools python-r1 eutils
@@ -9,12 +9,10 @@ inherit multilib autotools python-r1 eutils
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
 HOMEPAGE="http://openbox.org/"
 if [[ ${PV} == *9999* ]]; then
-	inherit git-2
+	inherit git-r3
 	EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 	SRC_URI="branding? (
 	https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-	KEYWORDS=""
-
 else
 	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
 	branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
@@ -29,6 +27,10 @@ REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="dev-libs/glib:2
 	>=dev-libs/libxml2-2.0
 	>=media-libs/fontconfig-2
+	x11-libs/cairo
+	x11-libs/libXau
+	x11-libs/libXcursor
+	x11-libs/libXext
 	x11-libs/libXft
 	x11-libs/libXinerama
 	x11-libs/libXrandr
@@ -47,22 +49,14 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-base/xorg-proto"
 
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-}
+PATCHES=( "${FILESDIR}/${PN}-3.5.2-gnome-session.patch" )
 
 src_prepare() {
-	use xdg && python_export_best
-	epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch
+	default
 	sed -i \
 		-e "s:-O0 -ggdb ::" \
 		-e 's/-fno-strict-aliasing//' \
 		"${S}"/m4/openbox.m4 || die
-	epatch_user
 	eautoreconf
 }
 
diff --git a/x11-wm/openbox/openbox-3.6.1.ebuild b/x11-wm/openbox/openbox-3.6.1.ebuild
index d06a776bab08..fb04b059624b 100644
--- a/x11-wm/openbox/openbox-3.6.1.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1.ebuild
@@ -9,12 +9,10 @@ inherit multilib autotools python-r1 eutils
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
 HOMEPAGE="http://openbox.org/"
 if [[ ${PV} == *9999* ]]; then
-	inherit git-2
+	inherit git-r3
 	EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 	SRC_URI="branding? (
 	https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-	KEYWORDS="alpha arm hppa ppc ppc64 sparc x86"
-
 else
 	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
 	branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
@@ -29,6 +27,10 @@ REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="dev-libs/glib:2
 	>=dev-libs/libxml2-2.0
 	>=media-libs/fontconfig-2
+	x11-libs/cairo
+	x11-libs/libXau
+	x11-libs/libXcursor
+	x11-libs/libXext
 	x11-libs/libXft
 	x11-libs/libXinerama
 	x11-libs/libXrandr
@@ -47,14 +49,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-base/xorg-proto"
 
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
 src_prepare() {
 	use xdg && python_export_best
 	epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild
index a2cb088ec10b..fd29dcff8e5e 100644
--- a/x11-wm/openbox/openbox-9999.ebuild
+++ b/x11-wm/openbox/openbox-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 inherit multilib autotools python-r1 eutils
@@ -9,12 +9,10 @@ inherit multilib autotools python-r1 eutils
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
 HOMEPAGE="http://openbox.org/"
 if [[ ${PV} == *9999* ]]; then
-	inherit git-2
+	inherit git-r3
 	EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 	SRC_URI="branding? (
 	https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-	KEYWORDS=""
-
 else
 	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
 	branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
@@ -29,6 +27,10 @@ REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="dev-libs/glib:2
 	>=dev-libs/libxml2-2.0
 	>=media-libs/fontconfig-2
+	x11-libs/cairo
+	x11-libs/libXau
+	x11-libs/libXcursor
+	x11-libs/libXext
 	x11-libs/libXft
 	x11-libs/libXinerama
 	x11-libs/libXrandr
@@ -47,21 +49,14 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-base/xorg-proto"
 
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-}
+PATCHES=( "${FILESDIR}/${PN}-3.5.2-gnome-session.patch" )
 
 src_prepare() {
-	use xdg && python_export_best
-	epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch
+	default
 	sed -i \
 		-e "s:-O0 -ggdb ::" \
+		-e 's/-fno-strict-aliasing//' \
 		"${S}"/m4/openbox.m4 || die
-	epatch_user
 	eautoreconf
 }