Fix duplicated dependencies wrt bug 259776. Thanks Mr. Anderson <walch.martin@web...

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/x11-misc/netwmpager/ChangeLog b/x11-misc/netwmpager/ChangeLog
index 3ac3fb8138e20e653fa94d6e6c628c754be16dd7..0129ebf7bec4c90b2591f021636d5afc17922c51 100644 (file)
--- a/x11-misc/netwmpager/ChangeLog
+++ b/x11-misc/netwmpager/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/netwmpager
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/netwmpager/ChangeLog,v 1.11 2010/01/05 04:52:08 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/netwmpager/ChangeLog,v 1.12 2010/06/01 19:26:51 xarthisius Exp $
+
+  01 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org> netwmpager-1.6.ebuild,
+  netwmpager-1.11-r1.ebuild:
+  Fix duplicated dependencies wrt bug 259776. Thanks Mr. Anderson
+  <walch.martin@web.de> for report.
 
   05 Jan 2010; Ben de Groot <yngwin@gentoo.org> netwmpager-1.6.ebuild,
   -netwmpager-1.11.ebuild, netwmpager-1.11-r1.ebuild:

diff --git a/x11-misc/netwmpager/Manifest b/x11-misc/netwmpager/Manifest
index 43fd1d74acc93536e03fcec76795606cb8216181..4fa792ee39f09017ff66745f480d7efc264d123e 100644 (file)
--- a/x11-misc/netwmpager/Manifest
+++ b/x11-misc/netwmpager/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX netwmpager-1.11-desktop-switch.patch 395 RMD160 2aca070c9297946d651f9ad9cad23c5f718368fb SHA1 ac29e30ecfe650d4400d3026b66b0016612daa2b SHA256 f1e9b0047169a282a2291ce1a71f5ed0e2cd5da56f48883a00f1572b5bd3c0fd
 DIST netwmpager-1.11.tar.bz2 37190 RMD160 ca863b3266ef1321f7b5ee47d2fad7fc1e2c35a8 SHA1 eb435c5796f9713589f372be6111480a1b59ab82 SHA256 925a159f13724168b78ccac712e02c8eda1ac741bf78f1b04dbedd92f3549c74
 DIST netwmpager-1.6.tar.bz2 44407 RMD160 819ce9a79e4cd34780e48139b0daa0abd459ca95 SHA1 200cf461accfa213407e0e6f5a23cff713f052ce SHA256 972fbc3ef09ef34272e48da5da8cc5e71f92f175258e74d24aff13888057a3e5
-EBUILD netwmpager-1.11-r1.ebuild 1219 RMD160 87eca126a1e5e9909740b5875a947aa771c35883 SHA1 904c44b9408322f4efd437cbc441b3d7fc1bed01 SHA256 d42317b2bb32974d7693ab0d7be14439a052bd3411a69bdcc690b0325760330d
-EBUILD netwmpager-1.6.ebuild 1013 RMD160 366116966143184344be0d0563f52a6fabb98913 SHA1 40d76230d8f938a9e922012710efa3e3b6af04b5 SHA256 98b8334f42b4425bb9b8d32eba1dfb93b8b76f9ca0ba2537ca9f04b7d7202eb5
-MISC ChangeLog 1828 RMD160 87331359c8904db6c3ce39e94783eade73885ed6 SHA1 392d5ce02af63b95ca0d941b0ef7f89156cba6a1 SHA256 ca9e978c1c3373fd88dce19dec48ecafa50782c2b8e3577fd6d68ae37d9b6cb8
+EBUILD netwmpager-1.11-r1.ebuild 1206 RMD160 bc3d5cb41d3b5a86ad6309299ac9212c98f16f3a SHA1 f0b50cfb2bcbe09e3fcb2aa663617dc2cef09d84 SHA256 03fd55b4d5fdb89596757e29f5684c59f99edb9b637dc7de3b7b43b17cefba75
+EBUILD netwmpager-1.6.ebuild 1000 RMD160 6e0f77602f8851ed54cfe31ae864e32c240b47b2 SHA1 b6090788077aae5a38ba489d367e1a82660e2f17 SHA256 e6796ca73f5f45ebddb09220d8cee130c70126c6bff2bb940dab9b4697ab6b34
+MISC ChangeLog 2041 RMD160 9974d389a14fa606618d0449c47d5e592a0c14ee SHA1 4a3c778f36d9db6addd6a82acfad0de9ba4a314f SHA256 499b9e00f4998f7b746f2661035484c9439b67945e1b19353e4528990628bc2e
 MISC metadata.xml 163 RMD160 7c2ff9d5408196433d3c5d74537d222335183899 SHA1 8be4981b79174c7879a386bd8e0fd4609ad9d41f SHA256 e8dcd61085d237c64dc37b1d7dd932b2c5e75010f9b6d9fd19b103bfe3a47797
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iJwEAQECAAYFAkwFXwUACgkQIiMqcbOVdxS5IwP/ZZJ9j4XbojmbiAvwrmBWi+IF
+2NwQ7ocjhF9q0d2ll28yPVAlN6nY2JfucdGLr0bFwEJbSyVOMDGyq6hKWbngB0ga
+HGdnVj/3Y9jkgjcBEzMFkksckh6H0GXLwArfMAq1yTTcTnAHkyIfA8QzhRto1D9L
+VKow3/Fq4AXRxE11FRM=
+=yxix
+-----END PGP SIGNATURE-----

diff --git a/x11-misc/netwmpager/netwmpager-1.11-r1.ebuild b/x11-misc/netwmpager/netwmpager-1.11-r1.ebuild
index 3413d538694abe873f2eeeadfb4fb1c07352df3a..e1294917b114ad288d002136c8b12cb39e2c8e26 100644 (file)
--- a/x11-misc/netwmpager/netwmpager-1.11-r1.ebuild
+++ b/x11-misc/netwmpager/netwmpager-1.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/netwmpager/netwmpager-1.11-r1.ebuild,v 1.3 2010/01/05 04:52:08 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/netwmpager/netwmpager-1.11-r1.ebuild,v 1.4 2010/06/01 19:26:51 xarthisius Exp $
 
 inherit eutils
 
@@ -22,7 +22,6 @@ RDEPEND="x11-libs/libX11
        x11-libs/libXau"
 DEPEND="${RDEPEND}
        dev-util/pkgconfig
-       x11-libs/libXft
        x11-proto/xproto"
 
 src_unpack() {

diff --git a/x11-misc/netwmpager/netwmpager-1.6.ebuild b/x11-misc/netwmpager/netwmpager-1.6.ebuild
index 74e5dddfb6caa51263b103ec00425d15e9ffda3f..9b5ed842b2d32ddfdf4991c87a91849df4ff9ae3 100644 (file)
--- a/x11-misc/netwmpager/netwmpager-1.6.ebuild
+++ b/x11-misc/netwmpager/netwmpager-1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/netwmpager/netwmpager-1.6.ebuild,v 1.7 2010/01/05 04:52:08 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/netwmpager/netwmpager-1.6.ebuild,v 1.8 2010/06/01 19:26:51 xarthisius Exp $
 
 DESCRIPTION="EWMH (NetWM) compatible pager. Works with Openbox and other EWMH
 compliant window managers."
@@ -20,7 +20,6 @@ RDEPEND="x11-libs/libX11
        x11-libs/libXau"
 DEPEND="${RDEPEND}
        dev-util/pkgconfig
-       x11-libs/libXft
        x11-proto/xproto"
 
 src_compile()