diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2012-05-06 09:01:55 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2012-05-06 09:01:55 +0000 |
| commit | 33a4b12473ddbc280c018d1231052158dcb4164e (patch) | |
| tree | 9feca0f70b3b359d70924be74a76c633436abee2 /x11-wm | |
| parent | Drop unused use-local desc. (diff) | |
| download | gentoo-2-33a4b12473ddbc280c018d1231052158dcb4164e.tar.gz gentoo-2-33a4b12473ddbc280c018d1231052158dcb4164e.tar.bz2 gentoo-2-33a4b12473ddbc280c018d1231052158dcb4164e.zip | |
Make pyxdg dependency optional. Bug #375897
(Portage version: 2.1.10.57/cvs/Linux x86_64)
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/openbox/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-wm/openbox/openbox-3.5.0_p20111019.ebuild | 7 | ||||
| -rw-r--r-- | x11-wm/openbox/openbox-9999.ebuild | 7 |
3 files changed, 13 insertions, 7 deletions
diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog index 323ddc33b07f..bcf54f2c85ff 100644 --- a/x11-wm/openbox/ChangeLog +++ b/x11-wm/openbox/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/openbox # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.242 2012/05/05 08:34:20 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.243 2012/05/06 09:01:55 hwoarang Exp $ + + 06 May 2012; Markos Chandras <hwoarang@gentoo.org> + openbox-3.5.0_p20111019.ebuild, openbox-9999.ebuild: + Make pyxdg dependency optional. Bug #375897 05 May 2012; Markos Chandras <hwoarang@gentoo.org> openbox-9999.ebuild: Remove WANT_AUTOMAKE per bug #413999 diff --git a/x11-wm/openbox/openbox-3.5.0_p20111019.ebuild b/x11-wm/openbox/openbox-3.5.0_p20111019.ebuild index e6246dc311e5..6279727b7db4 100644 --- a/x11-wm/openbox/openbox-3.5.0_p20111019.ebuild +++ b/x11-wm/openbox/openbox-3.5.0_p20111019.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.5.0_p20111019.ebuild,v 1.3 2012/05/04 08:58:57 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.5.0_p20111019.ebuild,v 1.4 2012/05/06 09:01:55 hwoarang Exp $ EAPI="2" inherit multilib autotools eutils @@ -12,11 +12,11 @@ SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz" LICENSE="GPL-2" SLOT="3" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="debug imlib nls session startup-notification static-libs" +IUSE="debug imlib nls python session startup-notification static-libs" RDEPEND="dev-libs/glib:2 >=dev-libs/libxml2-2.0 - dev-python/pyxdg + python? ( dev-python/pyxdg ) >=media-libs/fontconfig-2 x11-libs/libXft x11-libs/libXrandr @@ -59,4 +59,5 @@ src_install() { fperms a+x /etc/X11/Sessions/${PN} emake DESTDIR="${D}" install || die "emake install failed" ! use static-libs && rm "${D}"/usr/$(get_libdir)/lib{obt,obrender}.la + ! use python && rm "${D}"/usr/libexec/openbox-xdg-autostart } diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild index 39f3e0ff237f..9d50d1dc7b63 100644 --- a/x11-wm/openbox/openbox-9999.ebuild +++ b/x11-wm/openbox/openbox-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.15 2012/05/05 08:34:20 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-9999.ebuild,v 1.16 2012/05/06 09:01:55 hwoarang Exp $ EAPI="2" inherit multilib autotools eutils git-2 @@ -12,11 +12,11 @@ EGIT_REPO_URI="git://git.openbox.org/dana/openbox" LICENSE="GPL-2" SLOT="3" KEYWORDS="" -IUSE="debug imlib nls session startup-notification static-libs" +IUSE="debug imlib nls python session startup-notification static-libs" RDEPEND="dev-libs/glib:2 >=dev-libs/libxml2-2.0 - dev-python/pyxdg + python? ( dev-python/pyxdg ) >=media-libs/fontconfig-2 x11-libs/libXft x11-libs/libXrandr @@ -60,4 +60,5 @@ src_install() { fperms a+x /etc/X11/Sessions/${PN} emake DESTDIR="${D}" install || die "emake install failed" ! use static-libs && rm "${D}"/usr/$(get_libdir)/lib{obt,obrender}.la + ! use python && rm "${D}"/usr/libexec/openbox-xdg-autostart } |