Adjust virtual/x11 atom in DEPEND to avoid circular deps, bug #133671.

Package-Manager: portage-2.1.1_pre2-r2

3 files changed, 20 insertions, 27 deletions

diff --git a/x11-libs/dnd/ChangeLog b/x11-libs/dnd/ChangeLog
index 9a936a2e5cc4..93b7bb41beb9 100644
--- a/x11-libs/dnd/ChangeLog
+++ b/x11-libs/dnd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/dnd
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/dnd/ChangeLog,v 1.14 2006/05/04 16:17:40 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/dnd/ChangeLog,v 1.15 2006/07/10 08:27:21 exg Exp $
+
+  10 Jul 2006; Emanuele Giaquinta <exg@gentoo.org> dnd-1.1-r1.ebuild:
+  Adjust virtual/x11 atom in DEPEND to avoid circular deps, bug #133671.
 
   04 May 2006; Harald van Dijk <truedfx@gentoo.org>
   files/Makefile-fix.patch, dnd-1.1-r1.ebuild:
diff --git a/x11-libs/dnd/Manifest b/x11-libs/dnd/Manifest
index c40bdc829130..6c9585e40463 100644
--- a/x11-libs/dnd/Manifest
+++ b/x11-libs/dnd/Manifest
@@ -1,37 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX Makefile-fix.patch 1140 RMD160 6318cf1396d9b330686da631a54b8372ac98d2bc SHA1 95d3a49d2be3a8aca7523af506b6753ba2a54386 SHA256 c2f9d97c46f631d1ffa3dba2dd744b7bd10b71fab56456fe7874b1a5df60b569 size 1140
+AUX Makefile-fix.patch 1140 RMD160 6318cf1396d9b330686da631a54b8372ac98d2bc SHA1 95d3a49d2be3a8aca7523af506b6753ba2a54386 SHA256 c2f9d97c46f631d1ffa3dba2dd744b7bd10b71fab56456fe7874b1a5df60b569
 MD5 11a2ab0234333b2ca916b65798bee201 files/Makefile-fix.patch 1140
 RMD160 6318cf1396d9b330686da631a54b8372ac98d2bc files/Makefile-fix.patch 1140
 SHA256 c2f9d97c46f631d1ffa3dba2dd744b7bd10b71fab56456fe7874b1a5df60b569 files/Makefile-fix.patch 1140
-AUX dnd-1.1-gentoo.diff 1533 RMD160 07e0c5b3090c178ceea98212a6179c98a2d9d41a SHA1 88cc8fe4cc8505b63b836bb5032a94305ea8421c SHA256 89df82d580ed76da3d079241451f41d0f05e2bbb8e962b45f6fcf2326ed69e95 size 1533
+AUX dnd-1.1-gentoo.diff 1533 RMD160 07e0c5b3090c178ceea98212a6179c98a2d9d41a SHA1 88cc8fe4cc8505b63b836bb5032a94305ea8421c SHA256 89df82d580ed76da3d079241451f41d0f05e2bbb8e962b45f6fcf2326ed69e95
 MD5 0004edf0ec28c4b590e0832ba2463d04 files/dnd-1.1-gentoo.diff 1533
 RMD160 07e0c5b3090c178ceea98212a6179c98a2d9d41a files/dnd-1.1-gentoo.diff 1533
 SHA256 89df82d580ed76da3d079241451f41d0f05e2bbb8e962b45f6fcf2326ed69e95 files/dnd-1.1-gentoo.diff 1533
-DIST dnd.1.1.tgz 227598 RMD160 eac0744baa344024db2e40c0582c11d722baba48 SHA256 ffd9b74f1bf8e5c18a4745ef89e9c6618f9507ec09a010c4bf15481a3f130804 size 227598
-EBUILD dnd-1.1-r1.ebuild 961 RMD160 bcf73d2c60ca2d7647b15817043d13f7894451db SHA1 35a273d7306bee87ef9d39344590322670a3c837 SHA256 4da2da14795eaa3a6a81e75fc96d0c736670c9109a39823b559a123ded82d0b9 size 961
-MD5 49a6f2a6bfeb41969ae512dd32b5470a dnd-1.1-r1.ebuild 961
-RMD160 bcf73d2c60ca2d7647b15817043d13f7894451db dnd-1.1-r1.ebuild 961
-SHA256 4da2da14795eaa3a6a81e75fc96d0c736670c9109a39823b559a123ded82d0b9 dnd-1.1-r1.ebuild 961
-EBUILD dnd-1.1.ebuild 747 RMD160 e8c97ecf3960d2b56323198a30feaeca584623b5 SHA1 18216f228c48eedf6e2d38dd007b06efc7baa5c6 SHA256 91c8f82144bd5da52fb94b86e5ce5b41a5594cf9d0abcec15eb521d90d7b3304 size 747
+DIST dnd.1.1.tgz 227598 RMD160 eac0744baa344024db2e40c0582c11d722baba48 SHA256 ffd9b74f1bf8e5c18a4745ef89e9c6618f9507ec09a010c4bf15481a3f130804
+EBUILD dnd-1.1-r1.ebuild 962 RMD160 43c0bf5caa7939b22728733dc24ee0d1d1adebc7 SHA1 b30927ab516f50d6dd06469b4e67137da3b5dc4a SHA256 f03d96210a0d60a343488b57485d62c0d0ba811882d49af6718aa158db65361b
+MD5 7ebdf277f700350ac118a16379fee466 dnd-1.1-r1.ebuild 962
+RMD160 43c0bf5caa7939b22728733dc24ee0d1d1adebc7 dnd-1.1-r1.ebuild 962
+SHA256 f03d96210a0d60a343488b57485d62c0d0ba811882d49af6718aa158db65361b dnd-1.1-r1.ebuild 962
+EBUILD dnd-1.1.ebuild 747 RMD160 e8c97ecf3960d2b56323198a30feaeca584623b5 SHA1 18216f228c48eedf6e2d38dd007b06efc7baa5c6 SHA256 91c8f82144bd5da52fb94b86e5ce5b41a5594cf9d0abcec15eb521d90d7b3304
 MD5 ee6aaa90328a89090bc3d44662f4ef16 dnd-1.1.ebuild 747
 RMD160 e8c97ecf3960d2b56323198a30feaeca584623b5 dnd-1.1.ebuild 747
 SHA256 91c8f82144bd5da52fb94b86e5ce5b41a5594cf9d0abcec15eb521d90d7b3304 dnd-1.1.ebuild 747
-MISC ChangeLog 1776 RMD160 b1a41bc4e1440ca838cafe062b55724b655747f8 SHA1 80cff3af390b85ac148c694d96d2b36f23d08eea SHA256 fc1fa62d9cd299f5af82bff255fd73c5baa8ee8d1670b2c8be02b593f0fc86a6 size 1776
-MD5 be42b77bb759bb827e982b59c7e73296 ChangeLog 1776
-RMD160 b1a41bc4e1440ca838cafe062b55724b655747f8 ChangeLog 1776
-SHA256 fc1fa62d9cd299f5af82bff255fd73c5baa8ee8d1670b2c8be02b593f0fc86a6 ChangeLog 1776
+MISC ChangeLog 1916 RMD160 48b4e1b1d153a6d6723fd5980c2809779a670361 SHA1 487ef67a99f3dd9406f921d6c43982b2edd70ead SHA256 46610bbcdf49fba2efcd5f8f7c68647216f509daa9097fb60852b7c097f82c0d
+MD5 b43fb46062e1ad7555f5d0d11cb6e133 ChangeLog 1916
+RMD160 48b4e1b1d153a6d6723fd5980c2809779a670361 ChangeLog 1916
+SHA256 46610bbcdf49fba2efcd5f8f7c68647216f509daa9097fb60852b7c097f82c0d ChangeLog 1916
 MD5 94b52cd2289b2cbea049b76c0bef55fa files/digest-dnd-1.1 214
 RMD160 d31d41fd15c53a4bc723c0a711c5ca7d6668b0d8 files/digest-dnd-1.1 214
 SHA256 fe1a508cad7b3c75ec5746edb69735f6116bfb79c2d9f7bc88d19fc1daa76bbe files/digest-dnd-1.1 214
 MD5 94b52cd2289b2cbea049b76c0bef55fa files/digest-dnd-1.1-r1 214
 RMD160 d31d41fd15c53a4bc723c0a711c5ca7d6668b0d8 files/digest-dnd-1.1-r1 214
 SHA256 fe1a508cad7b3c75ec5746edb69735f6116bfb79c2d9f7bc88d19fc1daa76bbe files/digest-dnd-1.1-r1 214
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEWiltwnQyISwouHwRAuzwAJ9PDEPeKC2/ybaprQRLrunjR7pBMwCgmpvL
-KgDEF3phTb56SnjSz9D+ZZo=
-=wUl5
------END PGP SIGNATURE-----
diff --git a/x11-libs/dnd/dnd-1.1-r1.ebuild b/x11-libs/dnd/dnd-1.1-r1.ebuild
index 78990048a1e4..56d1b414e501 100644
--- a/x11-libs/dnd/dnd-1.1-r1.ebuild
+++ b/x11-libs/dnd/dnd-1.1-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/dnd/dnd-1.1-r1.ebuild,v 1.2 2006/05/04 16:17:40 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/dnd/dnd-1.1-r1.ebuild,v 1.3 2006/07/10 08:27:21 exg Exp $
 
 inherit eutils
 
 S="${WORKDIR}/DND/DNDlib"
 DESCRIPTION="OffiX' Drag'n'drop library"
-HOMEPAGE="http://leb.net/OffiX"
-SRC_URI="http://leb.net/OffiX/dnd.1.1.tgz"
+HOMEPAGE="http://leb.net/offix"
+SRC_URI="http://leb.net/offix/dnd.1.1.tgz"
 IUSE=""
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
@@ -22,7 +22,7 @@ DEPEND="|| (
 	>=x11-libs/libSM-1.0.0
 	>=x11-libs/libXaw-1.0.1
 	>=x11-proto/xproto-7.0.4 )
-	virtual/x11 )"
+	<virtual/x11-7.0 )"
 
 src_unpack() {
 	unpack dnd.1.1.tgz