summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-06-11 12:58:14 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-06-11 12:58:14 +0000
commit3c1b024f931f0542251579cb86f2ca8ce0689567 (patch)
tree4470acbfae9b49cff372509f5b59506ada47012b
parentStable for x86, wrt bug #417909 (diff)
downloadgentoo-2-3c1b024f931f0542251579cb86f2ca8ce0689567.tar.gz
gentoo-2-3c1b024f931f0542251579cb86f2ca8ce0689567.tar.bz2
gentoo-2-3c1b024f931f0542251579cb86f2ca8ce0689567.zip
Forcefully revbump to avoid accidental automagicness. Fixes bug#416673.
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64, RepoMan options: --force)
-rw-r--r--x11-apps/xdpyinfo/ChangeLog8
-rw-r--r--x11-apps/xdpyinfo/xdpyinfo-1.2.0.ebuild44
-rw-r--r--x11-apps/xdpyinfo/xdpyinfo-1.3.0-r1.ebuild (renamed from x11-apps/xdpyinfo/xdpyinfo-1.3.0.ebuild)8
3 files changed, 12 insertions, 48 deletions
diff --git a/x11-apps/xdpyinfo/ChangeLog b/x11-apps/xdpyinfo/ChangeLog
index d76b7d81f21c..cf7735cabb34 100644
--- a/x11-apps/xdpyinfo/ChangeLog
+++ b/x11-apps/xdpyinfo/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-apps/xdpyinfo
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/ChangeLog,v 1.77 2012/05/15 14:20:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/ChangeLog,v 1.78 2012/06/11 12:58:14 scarabeus Exp $
+
+*xdpyinfo-1.3.0-r1 (11 Jun 2012)
+
+ 11 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> -xdpyinfo-1.2.0.ebuild,
+ -xdpyinfo-1.3.0.ebuild, +xdpyinfo-1.3.0-r1.ebuild:
+ Forcefully revbump to avoid accidental automagicness. Fixes bug#416673.
15 May 2012; Alexis Ballier <aballier@gentoo.org> xdpyinfo-1.3.0.ebuild:
keyword ~amd64-fbsd
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.2.0.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.2.0.ebuild
deleted file mode 100644
index 7f1cef2aab98..000000000000
--- a/x11-apps/xdpyinfo/xdpyinfo-1.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/xdpyinfo-1.2.0.ebuild,v 1.7 2011/04/16 17:54:58 armin76 Exp $
-
-EAPI=3
-
-inherit xorg-2
-
-DESCRIPTION="Display information utility for X"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
-IUSE="dga dmx xinerama"
-
-RDEPEND="
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/libXxf86vm
- dga? ( x11-libs/libXxf86dga )
- dmx? ( x11-libs/libdmx )
- xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
- x11-proto/compositeproto
- x11-proto/inputproto
- x11-proto/kbproto
- x11-proto/renderproto
- x11-proto/xf86vidmodeproto
- x11-proto/xextproto
- x11-proto/xproto
- dga? ( x11-proto/xf86dgaproto )
- dmx? ( x11-proto/dmxproto )
- xinerama? ( x11-proto/xineramaproto )
-"
-
-pkg_setup() {
- CONFIGURE_OPTIONS="--without-xf86misc
- $(use_with dga)
- $(use_with dmx)
- $(use_with xinerama)
- "
-}
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.0.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.0-r1.ebuild
index 23d92bf382f8..5867fd5bbc3e 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.0.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.0-r1.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-apps/xdpyinfo/xdpyinfo-1.3.0.ebuild,v 1.9 2012/05/15 14:20:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/xdpyinfo-1.3.0-r1.ebuild,v 1.1 2012/06/11 12:58:14 scarabeus Exp $
EAPI=4
inherit xorg-2
@@ -36,9 +36,11 @@ DEPEND="${RDEPEND}
"
pkg_setup() {
- XORG_CONFIGURE_OPTIONS="--without-xf86misc
+ XORG_CONFIGURE_OPTIONS=(
+ "--without-xf86misc"
$(use_with dga)
$(use_with dmx)
$(use_with xinerama)
- "
+ )
+
}