diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-05-14 16:45:24 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-05-14 16:45:24 +0000 |
| commit | e5537dc7b7ff36acddd074f7e478a0e032534e03 (patch) | |
| tree | 367c92823902e7ac96449755d270058b83da88dc | |
| parent | alpha/ia64/m68k/s390/sh/sparc stable (diff) | |
| download | gentoo-2-e5537dc7b7ff36acddd074f7e478a0e032534e03.tar.gz gentoo-2-e5537dc7b7ff36acddd074f7e478a0e032534e03.tar.bz2 gentoo-2-e5537dc7b7ff36acddd074f7e478a0e032534e03.zip | |
fix deps wrt #415945, append -Wno-error flag
(Portage version: 2.2.0_alpha104/cvs/Linux x86_64)
| -rw-r--r-- | x11-misc/wbar/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/wbar/files/wbar-2.3.0-cfg.patch | 17 | ||||
| -rw-r--r-- | x11-misc/wbar/wbar-2.3.0.ebuild | 27 |
3 files changed, 32 insertions, 18 deletions
diff --git a/x11-misc/wbar/ChangeLog b/x11-misc/wbar/ChangeLog index fe0b780d9ce1..6e6f5ba3e93e 100644 --- a/x11-misc/wbar/ChangeLog +++ b/x11-misc/wbar/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/wbar # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/ChangeLog,v 1.16 2012/05/14 13:27:01 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/ChangeLog,v 1.17 2012/05/14 16:45:24 hasufell Exp $ + + 14 May 2012; Julian Ospald <hasufell@gentoo.org> wbar-2.3.0.ebuild, + +files/wbar-2.3.0-cfg.patch: + fix deps wrt #415945, append -Wno-error flag *wbar-2.3.0 (14 May 2012) diff --git a/x11-misc/wbar/files/wbar-2.3.0-cfg.patch b/x11-misc/wbar/files/wbar-2.3.0-cfg.patch new file mode 100644 index 000000000000..92634c5ba50e --- /dev/null +++ b/x11-misc/wbar/files/wbar-2.3.0-cfg.patch @@ -0,0 +1,17 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Mon May 14 16:18:26 UTC 2012 +Subject: remove wbar-config for -gtk + +--- etc/wbar.cfg.in ++++ etc/wbar.cfg.in +@@ -2,10 +2,6 @@ + c: @PACKAGE_NAME@ @DEFAULT_ARGV@ + t: none + +-i: @PIXMAPDIR@/@PACKAGE_NAME@/wbar.png +-c: wbar-config +-t: Config +- + i: @PIXMAPDIR@/@PACKAGE_NAME@/pidgin.png + c: pidgin + t: Pidgin diff --git a/x11-misc/wbar/wbar-2.3.0.ebuild b/x11-misc/wbar/wbar-2.3.0.ebuild index c1850ae15011..5128cf7708cf 100644 --- a/x11-misc/wbar/wbar-2.3.0.ebuild +++ b/x11-misc/wbar/wbar-2.3.0.ebuild @@ -1,12 +1,14 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/wbar-2.3.0.ebuild,v 1.1 2012/05/14 13:27:01 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/wbar-2.3.0.ebuild,v 1.2 2012/05/14 16:45:24 hasufell Exp $ EAPI=4 +inherit eutils flag-o-matic + DESCRIPTION="A fast, lightweight quick launch bar" HOMEPAGE="http://code.google.com/p/wbar/" -SRC_URI="http://wbar.googlecode.com/files/${PN}_${PV}.orig.tar.gz" +SRC_URI="http://${PN}.googlecode.com/files/${PN}_${PV}.orig.tar.gz" LICENSE="GPL-3" SLOT="0" @@ -15,30 +17,21 @@ IUSE="gtk" RDEPEND="media-libs/imlib2[X] x11-libs/libX11 - gtk? ( dev-libs/atk - dev-libs/glib:2 - dev-libs/libxml2 - gnome-base/libglade - media-libs/fontconfig - media-libs/freetype - media-libs/libpng - x11-libs/cairo - x11-libs/gdk-pixbuf + gtk? ( gnome-base/libglade + media-libs/freetype:2 + x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 )" DEPEND="${RDEPEND} dev-util/intltool + sys-devel/gettext virtual/pkgconfig" src_prepare() { - if ! use gtk; then - # Remove wbar-config from default cfg. - sed \ - -e '5,8d' \ - -i etc/wbar.cfg.in || die - fi + use gtk || epatch "${FILESDIR}"/${P}-cfg.patch } src_configure() { + append-flags -Wno-error econf \ $(use_enable gtk wbar-config) } |