Remove monolithic X from dependencies and other minor changes.

Package-Manager: portage-2.1.2_pre3-r6

4 files changed, 54 insertions, 36 deletions

diff --git a/x11-misc/xosview/ChangeLog b/x11-misc/xosview/ChangeLog
index 1f678384e41a..795becc154f2 100644
--- a/x11-misc/xosview/ChangeLog
+++ b/x11-misc/xosview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xosview
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/ChangeLog,v 1.29 2006/04/14 18:27:10 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/ChangeLog,v 1.30 2006/10/21 22:12:25 omp Exp $
+
+  21 Oct 2006; David Shakaryan <omp@gentoo.org> xosview-1.8.2-r1.ebuild,
+  xosview-1.8.3.ebuild:
+  Remove monolithic X from dependencies and other minor changes.
 
 *xosview-1.8.3 (14 Apr 2006)
 
diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest
index 98ecc9ebe9de..6408ac119280 100644
--- a/x11-misc/xosview/Manifest
+++ b/x11-misc/xosview/Manifest
@@ -1,24 +1,42 @@
-MD5 d88427b4fd48fbb4e1a9054088099280 ChangeLog 5352
-RMD160 ba3334522f72e6328340e491166b8e2004d4f152 ChangeLog 5352
-SHA256 d5f475be24ee9b51bd15f10286f943b9fa586dcb93fb61f0e1d7b55992a32198 ChangeLog 5352
-MD5 efaaa39f5b7d26d1feffe219417ed633 files/digest-xosview-1.8.2-r1 65
-RMD160 96db2522b6fb6e4e125ff2b94c171b4a914e705c files/digest-xosview-1.8.2-r1 65
-SHA256 2c6914adb3af2a0c05c252d915fc0f9daa0e00464109647d91e9d868b8a40a4f files/digest-xosview-1.8.2-r1 65
-MD5 8c6c1708135ded34438c8f4bc5139405 files/digest-xosview-1.8.3 241
-RMD160 04d1608e43b1de54cb92a9608bcfd09ac9b58e98 files/digest-xosview-1.8.3 241
-SHA256 d368c4c5870b977f44d160c9502d28bd84e22e3528731a52deb848f5dddf4822 files/digest-xosview-1.8.3 241
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX xosview-emptyxpaths.patch 1861 RMD160 e3c1d82654843335db656a12cb820f74e5a53692 SHA1 ae1a154a490c086be351ddb432d35fd1814f2007 SHA256 64e87a9c6e03e682be98986fa4fef68b57a779d93908f5bf9c8b2d4efd0930b8
 MD5 e5d743e89fadcc4cc2facb642650e018 files/xosview-emptyxpaths.patch 1861
 RMD160 e3c1d82654843335db656a12cb820f74e5a53692 files/xosview-emptyxpaths.patch 1861
 SHA256 64e87a9c6e03e682be98986fa4fef68b57a779d93908f5bf9c8b2d4efd0930b8 files/xosview-emptyxpaths.patch 1861
+AUX xosview-resdir.patch 1566 RMD160 1e185bb65f963bdbe09db2eff839d14996b7f511 SHA1 3c5bc93d7f4d85d5a8aa77a04510944a3361313f SHA256 b5c01c4c23119ade31a11bc3d567de83cc9605f6a277a61e89c99b91f942dd6d
 MD5 647297fad7639dbf11950956b41194eb files/xosview-resdir.patch 1566
 RMD160 1e185bb65f963bdbe09db2eff839d14996b7f511 files/xosview-resdir.patch 1566
 SHA256 b5c01c4c23119ade31a11bc3d567de83cc9605f6a277a61e89c99b91f942dd6d files/xosview-resdir.patch 1566
+DIST xosview-1.8.2.tar.gz 248859
+DIST xosview-1.8.3.tar.gz 259793 RMD160 595e812dee686ccaa5d95eb537782679d752271b SHA256 3aa28fb12552ea106e06f6958e1a0913bde8b0bb1491c091a3f1849717736b66
+EBUILD xosview-1.8.2-r1.ebuild 911 RMD160 487b2907f6e38e1656a0ce37580ef9859357c671 SHA1 49efb74b6e554e4c03037be4f612ecd80b88c62f SHA256 8a855370783113b9cd51dbea1f90899197cad53803effffd1d05a3ee44ab3453
+MD5 2f93cc223c20a15afa8176aeeb063ed7 xosview-1.8.2-r1.ebuild 911
+RMD160 487b2907f6e38e1656a0ce37580ef9859357c671 xosview-1.8.2-r1.ebuild 911
+SHA256 8a855370783113b9cd51dbea1f90899197cad53803effffd1d05a3ee44ab3453 xosview-1.8.2-r1.ebuild 911
+EBUILD xosview-1.8.3.ebuild 914 RMD160 09933e8b85dc276a579813cc17968787cf072646 SHA1 55c76b8a9941569c5ce184114d5dd8dc1bedde55 SHA256 a7e592280d0770ca101b7e05235c944274c3ab9aee3ecc711e25b041bbd80048
+MD5 eeb71b601a2b8be1f2d021e9d59b1610 xosview-1.8.3.ebuild 914
+RMD160 09933e8b85dc276a579813cc17968787cf072646 xosview-1.8.3.ebuild 914
+SHA256 a7e592280d0770ca101b7e05235c944274c3ab9aee3ecc711e25b041bbd80048 xosview-1.8.3.ebuild 914
+MISC ChangeLog 5510 RMD160 a7bebd7279ceffd9bc4e4109ed179cd934156689 SHA1 e2fa884ca8ea70b2e87846635b0346c9a73d4ba2 SHA256 cfc8fb12ed36f39d9b948ec699bcd64b1a30a35170a20ae7b71c84af7dcb4f1b
+MD5 f50bc0e5d5f212b29161df9cdb521cc0 ChangeLog 5510
+RMD160 a7bebd7279ceffd9bc4e4109ed179cd934156689 ChangeLog 5510
+SHA256 cfc8fb12ed36f39d9b948ec699bcd64b1a30a35170a20ae7b71c84af7dcb4f1b ChangeLog 5510
+MISC metadata.xml 173 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e SHA1 ca2ea648208cc74669b8a084f1b74e5cd4415777 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f
 MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e metadata.xml 173
 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f metadata.xml 173
-MD5 1500cab3fa1c9de3787d920f8c7d25c6 xosview-1.8.2-r1.ebuild 962
-RMD160 ce9860bb189a4647d8ba60cdc859f0f384ae29cc xosview-1.8.2-r1.ebuild 962
-SHA256 928053f3d36522abdcc879a4dd7fe9a85d77183c540982cb1a68d12c3c0b591e xosview-1.8.2-r1.ebuild 962
-MD5 6af97461dbd64266dd68ff022873ff61 xosview-1.8.3.ebuild 968
-RMD160 e2da31942ef7031e1409adb594e33a2e41fb8669 xosview-1.8.3.ebuild 968
-SHA256 361df0e694185b4943aaf83225b85703f4f72c912d6b7c3035ad8228e3505177 xosview-1.8.3.ebuild 968
+MD5 efaaa39f5b7d26d1feffe219417ed633 files/digest-xosview-1.8.2-r1 65
+RMD160 96db2522b6fb6e4e125ff2b94c171b4a914e705c files/digest-xosview-1.8.2-r1 65
+SHA256 2c6914adb3af2a0c05c252d915fc0f9daa0e00464109647d91e9d868b8a40a4f files/digest-xosview-1.8.2-r1 65
+MD5 8c6c1708135ded34438c8f4bc5139405 files/digest-xosview-1.8.3 241
+RMD160 04d1608e43b1de54cb92a9608bcfd09ac9b58e98 files/digest-xosview-1.8.3 241
+SHA256 d368c4c5870b977f44d160c9502d28bd84e22e3528731a52deb848f5dddf4822 files/digest-xosview-1.8.3 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFOptSvSApE0uP4UsRAiktAKCG8rFtGTlfHPoJNTkX6f97p6VXRwCdGMWJ
+UrKnZjZi8vRNYy5rDkxw068=
+=KPNB
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xosview/xosview-1.8.2-r1.ebuild b/x11-misc/xosview/xosview-1.8.2-r1.ebuild
index acd652080631..f5d1fb2c3285 100644
--- a/x11-misc/xosview/xosview-1.8.2-r1.ebuild
+++ b/x11-misc/xosview/xosview-1.8.2-r1.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/xosview-1.8.2-r1.ebuild,v 1.7 2006/02/07 21:12:04 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/xosview-1.8.2-r1.ebuild,v 1.8 2006/10/21 22:12:25 omp Exp $
 
 inherit eutils gnuconfig
 
 DESCRIPTION="X11 operating system viewer"
-SRC_URI="mirror://sourceforge/xosview/${P}.tar.gz"
 HOMEPAGE="http://xosview.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2 BSD"
+SLOT="0"
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE=""
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXpm
-		x11-libs/libXt )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXt"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto virtual/x11 )"
-IUSE=""
+	x11-proto/xproto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-misc/xosview/xosview-1.8.3.ebuild b/x11-misc/xosview/xosview-1.8.3.ebuild
index 38587113a9df..2b100b92b092 100644
--- a/x11-misc/xosview/xosview-1.8.3.ebuild
+++ b/x11-misc/xosview/xosview-1.8.3.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/xosview-1.8.3.ebuild,v 1.1 2006/04/14 18:27:10 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/xosview-1.8.3.ebuild,v 1.2 2006/10/21 22:12:25 omp Exp $
 
 inherit eutils gnuconfig
 
 DESCRIPTION="X11 operating system viewer"
-SRC_URI="mirror://sourceforge/xosview/${P}.tar.gz"
 HOMEPAGE="http://xosview.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2 BSD"
+SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXpm
-		x11-libs/libXt )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXt"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto virtual/x11 )"
-IUSE=""
+	x11-proto/xproto"
 
 src_unpack() {
 	unpack ${A}