Version bump. Bug #551372

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

3 files changed, 129 insertions, 17 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index cb1f6ec718a0..aabbd3991c86 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/openbox
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.294 2015/04/08 17:29:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.295 2015/06/13 14:24:59 hwoarang Exp $
+
+*openbox-3.6 (13 Jun 2015)
+
+  13 Jun 2015; Markos Chandras <hwoarang@gentoo.org> +openbox-3.6.ebuild:
+  Version bump. Bug #551372
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> openbox-3.5.2-r1.ebuild,
   openbox-9999.ebuild:
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index a6c82a25f348..a8ff57909bba 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -3,27 +3,29 @@ Hash: SHA256
 
 AUX openbox-3.5.2-gnome-session.patch 574 SHA256 45e1c57d9134d7e370f9dfe1c057f998e516900255dcb71b709a6d035fb8a4d4 SHA512 35d36dd2ddef05e21491df75a1d14c3d26dd17a8da79577d06fb3b7ddf6a179c7e23bb777e4cbdaa4bb4ab745db023981645f3dbe4dcf75c7b4d5f46e18b96c8 WHIRLPOOL 25288c03e121bc619f20f1deb1462d7555a6880944c9ea82bd8129de06a4b6f3483c4d7fd5158931e5915e4f7fa0367fb337542c90d8a024e1805d551f31295a
 DIST openbox-3.5.2.tar.gz 972751 SHA256 128fb4ef11f83f6edb1685cfc04f44a16a5322082fc519f9d7cac84fc658af33 SHA512 89c58364bc482f2b098341e28b2bbab69a791430ff8924dc0dd6fe56aabadde916d42a4e7dfb47cab21afebd747698e106a19e852444d2ede05e72ef423df09d WHIRLPOOL 808109bc07c5c2a1f2444501c91f4d3f111290d034811d46f63f21001343f0a368a648d964e69a7264d4a5f447ce780ceba9d075e4d65d5b928075776a8274f2
+DIST openbox-3.6.tar.gz 963207 SHA256 866c0ab8cb1cd15c7ae8022179cb6132a4c0f0476673bd3b834a1ef67a593ba8 SHA512 7f158a5236dcba5ec3c0e4fb5d1a5cabbd956d4125f19dfdb0594f5ded52545078d85ab645589ec3400a5306f63b43db5ee1ae26e3683141ee47f1b406d9788b WHIRLPOOL e6b4b0e73befe9a76ab4c4e388f7cea8b60874266c8ce8f2ce40b277a5b3744c99c10bde0bf3adc3650e10be46936352d9d758019288d9bbc24799f70de81ac8
 DIST surreal-gentoo.tar.gz 13410 SHA256 f478c58b2b6cd7a2a2ebe53fa261adb2d1fddf188f059d238b1b69ecc8701626 SHA512 dd43cb78e5e33345767edad22d0470765ac9eeae02bbad0acd8098bc096c15a166bf651493d12a5953bc043c9be92e9b160607eafb4723a6bcfc5d1d6fae235e WHIRLPOOL c9b406f4d822c8ce250bf8f30c9ad6bab75a0c1889a5b60061b83e44c06fd386f60c69ace176672d1a9658f4aa82fc82daaef205630c15c4711019cb48cca7ad
 EBUILD openbox-3.5.2-r1.ebuild 2828 SHA256 2472b47b48017edea9050b4224b91ffe471b6374ea5ab7aa176d825383979f76 SHA512 e55e2176871d73ae104a208bb9e46d7d8027e96d4e26f921212c3878db4a3784a039cb8834baa71a26a219a05a750d3ad8d369d97253ec6984692011e899d3b4 WHIRLPOOL 2dd0e85bb3acb2bde85fe48cab68676f6fc5fe0c556a7c643fa3be9168e48e6cc73d1b54bf32da2a4f2eaa9c623290fb7c661eefd29e66a4fd7a05a7a2735baa
+EBUILD openbox-3.6.ebuild 2832 SHA256 00cead2dd6b82b9d3fe815f006aa4d885f0ce0784fe88e3724ae19af4d552995 SHA512 a3676e86bc46adec82f567ed1adc1b5860b3b7be4ba823010961aac1ed9c2938395e41934f1dfce7d11e0ddeac7e794eb7ded9e307c9cea48a165d1a1ec5fa42 WHIRLPOOL b2411adeec8ce48b563dc8d990b20d4f59f34ff8475fbf1bc9b8ae442ed063c7d12a6c66205cd16ec31e294d948279010fade38ead264bedf8e620454b04b177
 EBUILD openbox-9999.ebuild 2785 SHA256 e95ffba225343ea9ae58b70c957255d2a601530cef6926b813163ae8903d437a SHA512 3727bff1539bef11297652befd0c301ca7ae51f292973a545752d50208cd72802dfd4d356e952531e04d30d2f527e91d1b8786dbfb377eb37e0d5e8af025bfd5 WHIRLPOOL f57b0fec85f3d0e6dc99b95dabeed07cd439f73878ba57655a771df929c77a6aed939872dce70d7b6d4ce87fae73586dfb4e9a0264f806c3e0d3e0a50835b8b7
-MISC ChangeLog 44842 SHA256 f60e074ed56b0232dbe7484a21de909ce2c63f58316ba74ec8bb9cdaab77124d SHA512 38c944da98166329b7f6c2d241a43366da3eb476cff5bb8633d30f5a0b1ed433c2d1365f389dec31b8bb18cb06d90611215ba1302410653a1a941f3bf359a8c8 WHIRLPOOL eceb48803c911bebd86041f62f2b903a7b6718d646129a923471a45c5b999420e5ecf73efb47c3cd4fe883d1a44acde677403b06fc59176e1a8ea536abc33255
+MISC ChangeLog 44975 SHA256 55adb9d8bee87ccd8bccf194e67d4ab50e7a7513c554bcc4044c9b359be509e0 SHA512 090417cfb2767cc01b01687bf239edd9cb2272820e5e9c80d9256a5b30d5e81dc903ecc598aab3af610f8eed749815855762d1da52727915f9c16a10b5726bad WHIRLPOOL 9e4e4c835ba084242ef5c21a96e41fd712373c1ce4f4a6f7fba6d7389031126973b9418163a1318c3cbdfdd703e1fc5f2ffe64b4faca2603d774ecc687f09179
 MISC metadata.xml 747 SHA256 89eaa0ca0c1130ce4748c14d8df0e4df2430e5c22f22c205bd35562fa503ac3a SHA512 e0da9e555d27b9aaafdc400f1e3d24575850f07466555a107e00d6d26c4b6c16421bc08b6a0ebac9cdae64523dde52da42a834e64a0429432507883841409163 WHIRLPOOL 1f9e4d9ff42fa51347b55c57d87ff300ce2dcba730f9a84413ad726637f1b911654ecbcfac6dec3fcb9c23d1026b0986eefbe893d06784a4ce27fd39dddf24d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJWV1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOSJEP+wYHYmuAwMNVoqioF2sd1Kgr
-bKtsZv9rwHiSYIqe6gaXMvTkhriYAbX2P3OlHSIQPQuJMldBk2k6P7n+HoAVPRQm
-gPrL6GdoiQwUjnLDn2Y2Jok5/17s8UNBNV3C8eB0zZah28HzoTuknCrQ5/6flMsu
-EwWqkEvctLSoJMMaz903tt2GP6v8GDSoHemTQwSOp2YP7m3Ympx7nvgyuX5vRAgs
-g6PVHBCqClz2hxoB0lQcaYITSaUhYvt1owTpkVWE5Tr8OwFDSSb95AHA8mf4N3RZ
-EVqzENzk1ucGuy9v9Ic03UUuhMVInwSpHzUvae6K0++nJBvr1Cf42SPEFh7Jn5X9
-zWrqXgglZ9aaBHAhAb4paIn/n3Wsf+pJ0fAz8M2NKBMsFcp/aKThx7yl6mYTOVLM
-/tYYQCWBEqdz0qxExCSPYdEKrenmceDGWCydwgWwCWB8w33AIxIBYzU21si86sPq
-NIaWqn86YXmXWd5Z/WQh4iEyHFV2KxafO8KQWbr/lcaAEYJaxvtVH0gqgXycm/aT
-hYdWg+TvAtgfLSTmBr2I7z2umxKACQm9jR0Blpcm68dzCJIoJYTJg/h2jCNR3muS
-/rrA7UEJf+gR22EedBrEXWJUAAsj5G4L8a+LjKMsTWkM9qJrYq2teZzOp+TXIcwx
-RWxuKBOqAd1nkfbdL0ot
-=VI9K
+iQJ8BAEBCABmBQJVfD08XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88/bcQAM3saPTRVtyNqvT57DuTDMTZ
+s3dup9bBTg/Yon6yhAbo1FbhwsRA5vHIEm9J1C/sNwogohIHDBNIDxUW0E3YOSLc
+G61c2ssNdHrNTT399JkGEHObgcS9lx+0WvX/tuUh7Uj9AHTXJvgk1B+hYS5t/xBI
+gvcDpLc9N0VDXar6h5dRjZpDSjHexfZxKXENFdNfQifNvkfOraW50bzM1WjnCJwq
+Z9LZvFiAGRuMJKSQqPE6wKRx2CLT+94D1hd8flguucKCey7nGl1Ce85Z5c3UOXRZ
+bVSXgW02h50hUDJErexM/okXV+tOUFWlSGbdXdgRPr1e4QTa4JRicceCeZRF4TVk
+BQ+PjUG3jqE77X5lyy4yeShOZj4gNAQVUK5G6dDxelss78dP3VmrITv0YxOaUUp7
+o4tXvUeXp1PfQkRYPZtKiaPpTkNaV/1IRb++kV4sDYyBBqEgu4kE2VKC0xUfvIK4
+2xOCxW04J1FpLICxDiFkdaQBrpDK6DhrC6e07J4JJbXRRa7xzKrLvDyGpMWr5TUz
+w2BtxAdY5QR3voZNT89HzanIP6tb5wuCoFocrGQTqphiDdEWVuelerfoP1ZV8wRx
+CCRsJPS6L+Vt842BuatVg5bXK99MxDBghhC3pDgGghWbFq0CiAHjSmhsr6kNwAGI
+SUQ3PdnJG1FWRlSzM8e6
+=b06I
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/openbox/openbox-3.6.ebuild b/x11-wm/openbox/openbox-3.6.ebuild
new file mode 100644
index 000000000000..ff47ff453240
--- /dev/null
+++ b/x11-wm/openbox/openbox-3.6.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.6.ebuild,v 1.1 2015/06/13 14:24:59 hwoarang Exp $
+
+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? (
+	http://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
+	KEYWORDS=""
+
+else
+	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
+	branding? ( http://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-proto/xextproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xineramaproto"
+
+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
+}