Add svg useflag and missing dep. Multiple other fixes. bug #481922

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

5 files changed, 187 insertions, 46 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index dadce9f706cb..696088c536c2 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-wm/openbox
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.277 2013/08/17 11:56:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.278 2013/08/24 23:35:40 hwoarang Exp $
+
+*openbox-3.5.2-r1 (24 Aug 2013)
+
+  24 Aug 2013; Markos Chandras <hwoarang@gentoo.org> +openbox-3.5.2-r1.ebuild,
+  openbox-9999.ebuild, metadata.xml:
+  Add missing useflag and dependency to librsvg. Rework ebuild and migrate
+  to python-r1. Rename xdg->python. Sync 9999 ebuild and use a common
+  ebuild for releases and git versions. Thanks to Julian Ospald
+  <hasufell@gentoo.org> for the fixes on bug #481962
 
   17 Aug 2013; Markos Chandras <hwoarang@gentoo.org>
   -openbox-3.5.0_p20111019.ebuild, -openbox-3.5.0_p20121006.ebuild:
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index af5db068112b..dec5efe515f8 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -14,26 +14,27 @@ DIST openbox-3.5.2.tar.gz 972751 SHA256 128fb4ef11f83f6edb1685cfc04f44a16a532208
 DIST surreal-gentoo.tar.gz 13410 SHA256 f478c58b2b6cd7a2a2ebe53fa261adb2d1fddf188f059d238b1b69ecc8701626 SHA512 dd43cb78e5e33345767edad22d0470765ac9eeae02bbad0acd8098bc096c15a166bf651493d12a5953bc043c9be92e9b160607eafb4723a6bcfc5d1d6fae235e WHIRLPOOL c9b406f4d822c8ce250bf8f30c9ad6bab75a0c1889a5b60061b83e44c06fd386f60c69ace176672d1a9658f4aa82fc82daaef205630c15c4711019cb48cca7ad
 EBUILD openbox-3.5.0-r1.ebuild 1876 SHA256 cffd9d0d31c1895d94149ee0d1c6a8fe2e76cc0e4337eb8c0720a43266af2206 SHA512 8de93cb42cc2138ad72d49776d3e9072a96ec645c52c1a12519834c4c7a40c1ce73af35035ff5f1b7e530e704c04fcfd455643327282c748e601eafade7a554a WHIRLPOOL 4b860ba4cade8bd02a0a249565b88b8b30d0558ace342080ec4d39d9723e926c53dfb71806f8868f8ffa68a6b8e4998a9d2f7280b94f2a8208009d801b5a8c76
 EBUILD openbox-3.5.0_p20130215.ebuild 2337 SHA256 0cb073261902e56873c97d87356c8de9385b562de43fd468664f7b9faf25e8c9 SHA512 b8ab61a1136a7b79db5ca710e6db01229cef52e92780859164baf9469cfa92e0a7c63cddd2cb7375dfae3c393d25888d1dd40394cd08e400dc0209345be0d43b WHIRLPOOL 552f1a1934f8c04d7c61b14f6f2bb8d69845438f2f91662075b6a547d7fcfcc00fe5e0f5e26784db9a47256318d59c131a9b71f6b978607077413a69baf45f25
+EBUILD openbox-3.5.2-r1.ebuild 2834 SHA256 5b8ede8681ef81609847a79abc1c897c2af1818f1d9d845c77c3e372abcf5bce SHA512 07bf799bed2cd8d0cc34984111339d77a5dffd48477bc360b0b2d1f048a22570e888974b01454102e72d8e318a3d483c95306fc8ed94fd2bb952791bcb5241c9 WHIRLPOOL 7c0b81d17b98ecc52bbcfd8ce3c931802c5505ff8ab3edc209dacdbeb71fbd2d9bbd3f91c5c61a5b4fdf9c69a7acc40b3455efbb21ef2037dd258329d8e6ae5a
 EBUILD openbox-3.5.2.ebuild 2306 SHA256 cf08410519230d1f54df68986f9a888e7f2b30585d6129124f5c0c7f7215c8ec SHA512 0dd9615994132cf1b43f5ce71af68f396114a35e5bba498e816c14e6b4c2c0804bc7d1312262f7383c8a910a7a585f5b400b718a4e00d3d52aed240a860abfc2 WHIRLPOOL 6900d197fd79c258fae74d5f0163e3cc740552c34302d059053415d5b8453c942d9ab36c5a049df3832715ec6f6e7c0df934982fc5e6fa4721e90b0e3ce9e148
-EBUILD openbox-9999.ebuild 2431 SHA256 13e51173cde21fe8f67372d9cdde6f85e131f8101c2574d90a1f1d664f36333b SHA512 856778f74e547633b2608f29e9ddb00617cbeb8333081531cf3d45ab9248d8e8e93d62bdff13d2aa8e8bf3286a2134e54a571ada9f4794b8d1e6ab6e64cd8b33 WHIRLPOOL 6977ffbdbcf7004c2fa42efeb2db5afb9aeae53dcaf65927a77f7c715101b37c96794588ee7db29d83677c6f73fbbfd04ffe9fa0500ed14bb14135c8eb40bc17
-MISC ChangeLog 42414 SHA256 bf94de335213f43af4c5b41c635ea2ec4fc3161c6cb16c9d515f35f6a78b8a2a SHA512 5b02c85e2f86936ffbadfb14014a328c089429f10f6440ab2b6e85742458edd1e0d31c4799f245f3080c687654ab3c7374637e1ed24bc7ec31a8bce111a7d964 WHIRLPOOL 62b368220a9984fbe41e77102d5c6bb9c9754f442a3f89a53297226faec1ead0b275a0a08dc7de3bd29deea722309ddea434ef13b91af3bff8bc193de61c1297
-MISC metadata.xml 776 SHA256 d02e05a5db0427f6575fd19364c8dcf112bd8b404662f557f1046ec95535a1a3 SHA512 8af195dfdff20741f78feb28f70714d7f65293ab2b8e1ef31adc43ef0712e227045926228460c35dc0263039c6660984b103c304b1cb9ea58ad65f8fc72df26e WHIRLPOOL 6f038167fa6a1dca44ccb2b7d21a6701e66366475cc0fd2bbe6471079abc7bb1e12f61e2b4138a5b3c3c246d7664c505c049f49a59aa6c28ba04f3ad321a4ec9
+EBUILD openbox-9999.ebuild 2831 SHA256 6d7362577de1cd28325ea53407acd5b8a009496cc9b75cc4d5602f459e45279f SHA512 2c2723116a6ab2a08b25789009640ef05d42e6068dca998a1cb3b70bf5bbcb13002bddb854b514a49d26c84cae2d1e5b657b8587771b49f083b3ef97cdb0ae9e WHIRLPOOL e2076fe0296bfda4ff4903bd6477d598ac492feca96b429883eb36b90d096f610e6b9f0392f363ba86fa18ce8e6b72a337af27632e6e249d05f32ad985951197
+MISC ChangeLog 42826 SHA256 955ed6c972b5d306206af31e544ca7cb3dd3cd30428024f6d3f50e045db7c679 SHA512 a15282f8b01a8a61b589cf19a4446d9e92a5f5b62c2f9aedb475b87aa2b3ec70fc14d81ae72eea7e1265f969e08f825a388bef14985b01482f41192008e59fbe WHIRLPOOL dd52873a4d1b3ee9095dde14c47db01b939468ce0acadb22cc14ff352fbf15a57e48cbbc4655f00e4a35d4f79bb50550bad7415c4065c2c5d9531546764a618d
+MISC metadata.xml 885 SHA256 e97d52ad24cf2fd9d42bd16982cacb3a6ff9fc6f8ba802f2800c9ea0f8d98eb1 SHA512 f2f128e9ea0fd55b0e84617f645417f8938d0f7d5f197fcb4a49703607bebb542aa4e5c472d3c79977644affd4b70a127676205307cbec89f727cb0306cd118e WHIRLPOOL 1b6a5360c33de537ce93e75c5ca03bb8d36316fd3171fafce4f98ab4654b7e8dafc3e5c8d5876ff7733bf4fd4a50fe58498c8d04b59d85967b85d8736151f026
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSD2TeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSGTUoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88LycP/1drFNFX2cqn5RL0qi42K+BR
-ECk9JXyaZ00Lx8RCpU5BTnr8IO9jC0ifWmAgKhyG2vS2TO+QVlIn/c1IGbRZ0wMF
-e5V+7rKJAoimNR549n86cFexeu7Af9Kmjwdb+5WdxjJLmjcYvwIwAtPL0NuEp2/W
-Rma1pssq2KYYYXdvU2EpNhffpmCO6y9Uz8c2lu4ubCZ41yyJrvUPDLI9J4DNmwYL
-UxNchU3fio93oxGhtKA+vrl2MHQZFHE0CQgiB+I2rP1Rx5poxjbiFN6/w/Qrrrr+
-gR2fUu4KgXufK+gGa4+G8QR4yALZSurDqwLwGKCWIqgqDVillqrSWBov5VvWoCMT
-BbQIfZUjEreShh6cJPMdxiO/2W+YXnWSGNlbPgLh9ueRigr6jVaqpwdW59qHRJnY
-i4GtV/JOnmblznotEKxi41ZJJJt9hi9PCOm3mt5cZ+hlU7QKntBZpunX3fvKi6s1
-uThUoqeVPAjoWiwa9hLgsDoiNQtEWyoXE6G/pJCyS5CDiCTKLbL6o41Jwz/xUJoe
-VnUJhzhxTyY0MwBW8JN1zYv6wnK0Lvq6GAmX1AdV37fy4A6z+PvZbQtt9RrUVJX7
-YWkqJxHPnH3QXjI5qzz2Mk6QyvWMXuUHhuCDZUTCgp+lSKwhzfyvokA03DTDuRvE
-meAj/1tvrNKOnIg9J1v+
-=6xko
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun885YIQALc0J7m9E8Aa5UUSm6axniUI
+WOP/Dao1c8A6YTj0myXafsKCQ8vzDJTDOn4OlSLyx3+DK51KXsZDzHwEnTyTkbRT
++lAiBS3cE3AofVtPfZTs+r0myMEDU4IrqzOfT0UTRAlYmLxkn1LcYPgPzmVHJLGs
+2tptadF6atk3twPaM01AZGXtv3b39x+JaN8FWdxlGi/ssaA2wQC0N/rxt4uo8pH7
+WPMKr4Ysp1+wpf3iCwmaPFtPehVPXkeS28LFORXZKrZm1FxOaS1rCrE0fxfkQe2D
+EGTHtPM1stAs0HMN1v/3obrWY4LecToWfJVftnN0o6jswccVso8bvgRNOBMaCzjw
+ulx3N1HVuhbLnH6eSjnpQF1D+9mWiY0JVPOr/PFlHVs8Y58VWfgFK5VDvVs7dAr/
+IlBL+Q9r5zfp9wwqcSDYX1PZDRpFkmeU6xDIdEnRYw+WFEx2kinijS66E0ao3wV1
++v7X96SdoH6HYpdnMX6eCAk/lkUDWY4X14lxGNVRkQzFzMg7J/OoV6/etOcriNSS
+15p58rgohWHnIGn7Dl95HhqYpzReKXjDOmnU3TddTwfja5fYjEZK1NK+4U41mCdU
+4O9cumD7Mpw/UUgX/fP30lMYP1dfoitSWM5BPQb2fSQeP362AYiTVC2cC1QMwjt5
+o2Jh1HDaiqoiVm6a0MGp
+=z5hz
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/openbox/metadata.xml b/x11-wm/openbox/metadata.xml
index 0c1b87464354..c0f3931eb2db 100644
--- a/x11-wm/openbox/metadata.xml
+++ b/x11-wm/openbox/metadata.xml
@@ -9,7 +9,8 @@
   </maintainer>
   <use>
  	 <flag name="session">Enables support for session managers</flag>
-	 <flag name="python">Install the python xdg files for xdg autostart</flag>
+	 <flag name="python">Install the python xdg files for xdg autostart(for compatibility with old ebuilds)</flag>
+	 <flag name="xdg">Install the python xdg files for xdg autostart</flag>
   </use>
   <upstream>
     <maintainer status='active'>
diff --git a/x11-wm/openbox/openbox-3.5.2-r1.ebuild b/x11-wm/openbox/openbox-3.5.2-r1.ebuild
new file mode 100644
index 000000000000..31df8319c72e
--- /dev/null
+++ b/x11-wm/openbox/openbox-3.5.2-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.5.2-r1.ebuild,v 1.1 2013/08/24 23:35:40 hwoarang Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_6 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 ~hppa ~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
+}
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild
index eaadb181d5a6..6a510b297d32 100644
--- a/x11-wm/openbox/openbox-9999.ebuild
+++ b/x11-wm/openbox/openbox-9999.ebuild
@@ -1,80 +1,105 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-9999.ebuild,v 1.23 2013/08/14 18:05:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-9999.ebuild,v 1.24 2013/08/24 23:35:40 hwoarang Exp $
 
-EAPI="2"
-inherit multilib autotools eutils python git-2
+EAPI="5"
+
+PYTHON_COMPAT=( python2_6 python2_7 )
+inherit multilib autotools python-r1 eutils
 
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
 HOMEPAGE="http://openbox.org/"
-SRC_URI="branding? (
-http://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
+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 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+fi
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS=""
-IUSE="branding debug imlib nls python session startup-notification static-libs"
+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
-	python? ( dev-python/pyxdg )
 	>=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 )
-	x11-libs/libXinerama"
+	svg? ( gnome-base/librsvg:2 )
+	xdg? (
+		${PYTHON_DEPS}
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+	)
+	"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	app-text/docbook2X
 	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 python && python_convert_shebangs -r 2 .
-	epatch "${FILESDIR}"/${P}-gnome-session.patch
-	# Lets try to replace docbook-to-man with docbook2man.pl since
-	# Gentoo does not provide (why?) a docbook-to-man package
-	sed -i -e "s:docbook-to-man:docbook2man.pl:" "${S}"/Makefile.am
+	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//' \
-		m4/openbox.m4 || die
+		"${S}"/m4/openbox.m4 || die
 	epatch_user
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		--disable-silent-rules \
-		--docdir=/usr/share/doc/${PF} \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable debug) \
-		$(use_enable imlib imlib2) \
+		$(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) \
-		$(use_enable static-libs static) \
 		--with-x
 }
 
 src_install() {
 	dodir /etc/X11/Sessions
-	echo "/usr/bin/openbox-session" > "${D}/etc/X11/Sessions/${PN}"
+	echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}"
 	fperms a+x /etc/X11/Sessions/${PN}
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 	if use branding; then
 		insinto /usr/share/themes
 		doins -r "${WORKDIR}"/Surreal_Gentoo
 		# make it the default theme
 		sed -i \
-			"/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
+			-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 && rm "${D}"/usr/$(get_libdir)/lib{obt,obrender}.la
-	! use python && rm "${D}"/usr/libexec/openbox-xdg-autostart
+	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
 }