Forcefully revbump to avoid accidental automagicness. Fixes bug#416673.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 28 insertions, 56 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/Manifest b/x11-apps/xdpyinfo/Manifest
index 5ffb8eb01300..1480432a22f3 100644
--- a/x11-apps/xdpyinfo/Manifest
+++ b/x11-apps/xdpyinfo/Manifest
@@ -1,16 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST xdpyinfo-1.2.0.tar.bz2 121514 RMD160 9b9360926d8bd9b9a22ccb143c27415d43683ccc SHA1 5d53cd31afd40bdc4575b5347f2cda67f135f5f2 SHA256 fe5bad498ecfbf21f9a2a18eee5ece9de5d52f68878f250db8f575c9b872b5ce
 DIST xdpyinfo-1.3.0.tar.bz2 127611 RMD160 ae868364c828800f761639d173a2fe4b5da3393e SHA1 39936ff600434614d3ee53038d814246a03f4acf SHA256 23ee4944a32b5701b4379cb420729eb7a4dde54de2b5b006d4747855efd6d73f
-EBUILD xdpyinfo-1.2.0.ebuild 1114 RMD160 07e9f7135f229998c51f229c1103c1e528534050 SHA1 e5d4c4b95fa12d701db6798b8241390e75a5d0f7 SHA256 0c1b0862d279fc78497903bb72b42e3c4dbf5bf77011abfa618b86451a703d95
-EBUILD xdpyinfo-1.3.0.ebuild 1148 RMD160 4a8a4530517805ee49bf5430199fb4c39cd0013f SHA1 08a83c7d00a3fc248839c3bb69500afa0774384d SHA256 82700c4f774da6f56194a353332a69fd7a51a5d0622d5bb6063907abaed14aa8
-MISC ChangeLog 9086 RMD160 f60a29c7d634692efb3af6288f63d0c2bb95a5e1 SHA1 2c4cda84145a4d22a0230bcd0da8925704cec9a6 SHA256 e1f8aab559f989bb3a0ed7945c616efdc4c46c13e6659eb96a1bec26a89ed80c
+EBUILD xdpyinfo-1.3.0-r1.ebuild 1158 RMD160 d2b0548aa50ef4071ed78348339fb4559368456f SHA1 0bb58e44cdd9cae3ec1a9a7c7ab89da063643cc6 SHA256 51d142401e4e04ad1339a094d50b7e0eb6f8d0bbd952566f7346513f49f16565
+MISC ChangeLog 9328 RMD160 e0dc0806f8c85001d6d4e037cedaefd31321920c SHA1 ad4ceb6ebeb56a933057256babce239b89117a82 SHA256 aa4df0d31dc7e4d5fe08d3a00a893684a559a8d3052c5abdd6b7e3b72090714d
 MISC metadata.xml 273 RMD160 dbbbc1da7f629655f829d813b88882a76af2733f SHA1 9378045924794791a754d2d674b8790f6394a6f6 SHA256 577e8a2249a12989affed336a6fe092bf12cfec6caa070ac62247b47e6e51378
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+yZigACgkQvFcC4BYPU0rCeACfbkxCgkEbWyi59D4m3NJzeBCW
-c6UAn39QBXW020sLvU58sBjFL86cBnUV
-=qpKX
+iQIcBAEBAgAGBQJP1euWAAoJEOSiRoyO7jvo1Y0P/i9ftfD+OSQC3d9UwcAF/+n5
+PkfeZcgf82pYdve8IJ05goZWCRJKhPCnYIwRK63EKBDc3yCmt+i7dwvbdr/Kmj6j
+dgxWAsB5DWSVi5+LXv88JbNI5uEUC82S/GWFR8XH/o/Yy9rLPszPGAAs70jS6xhs
+EhTvqvNqL1MYDDfskKIS6xX2jzyDZ/t4WDiQpjAqJssz5tl4x3yn2Ochn/dws78h
+2Ihj5uN9JGkO63C6yBGxSLk7dKDuNRFnC5/5QI/MEU7EcVgBkTvDIggzsxXAorDL
+d13hsar2etC2hGPTWpiHz5vgVG+O0WoQ3+8YAY0hSoYf8sUhXGy1imValVnEzOgF
+8w+1Wf6EMLXyMS9uRr9KYexOu/2uwJN3xevTJwMHFdvfnxywVCX4qb0W1whTsasn
+WeRujv8LfUlw7NWH0V858k/3TMCA3WHOwzPjWni15nfFhjIVcb5jlAFXsdQ/PMP7
+0PoG28hUOUTpEr6yB7vilEKPhKagvHq6DMxoVR66jspZMzBJqvdSEGpl9MkfmN5z
+A7mkQchcFZ1zkI5drXoXAW4P1gUlCpUPkIQQMVGZXFqDKM/ePTNU05Kph3aBN40L
+lPMFEJ0bBJTP/LV1yj/G6+BlwzgnuStXvKp9jXyhsNOdHKc4xPwqk4FM+GKyGifJ
+4/lCM77SIw6SMLPfN2cg
+=9Aff
 -----END PGP SIGNATURE-----
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)
-	"
+	)
+
 }