| 1 |
commit: 5460cf4ab981498b872876d30e88c8b00a6dde05 |
| 2 |
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 5 00:20:53 2011 +0000 |
| 4 |
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 5 00:22:09 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5460cf4a |
| 7 |
|
| 8 |
x11-libs/libwnck: fix slot and block older libwnck:0 |
| 9 |
|
| 10 |
* Hard-blocker to avoid file-collisions b/w old libwnck:0 and libwnck:3 |
| 11 |
- Yes, users need to temporarily unmerge libwnck:0 to resolve the block |
| 12 |
- Shouldn't need to, though, portage should be able to resolve the blocker, |
| 13 |
but it doesn't |
| 14 |
|
| 15 |
--- |
| 16 |
x11-libs/libwnck/Manifest | 4 ++-- |
| 17 |
x11-libs/libwnck/libwnck-2.30.6-r200.ebuild | 8 ++++---- |
| 18 |
x11-libs/libwnck/libwnck-2.91.6.ebuild | 6 ++++-- |
| 19 |
3 files changed, 10 insertions(+), 8 deletions(-) |
| 20 |
|
| 21 |
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest |
| 22 |
index 5c4e144..e8da869 100644 |
| 23 |
--- a/x11-libs/libwnck/Manifest |
| 24 |
+++ b/x11-libs/libwnck/Manifest |
| 25 |
@@ -1,4 +1,4 @@ |
| 26 |
DIST libwnck-2.30.6.tar.bz2 724558 RMD160 d9c228bfe1257de9b1b1e8a3fc3b8c38d6e665d9 SHA1 a7ef8842f85249878fd0389ae6c1b303d41e9623 SHA256 4d25984ed5cfe215eb650f960de634300a6cafc9d98bbc7caea8043b7cd96cc5 |
| 27 |
DIST libwnck-2.91.6.tar.bz2 729224 RMD160 09e2cd5a2fce511ec2234240959adddc5f1ab536 SHA1 25e135452518984e8238c62fb8aab05af452d8d7 SHA256 da397528a9fa80bfa236d5e6b871896fd72e48b6eab0a056ce05231e94766217 |
| 28 |
-EBUILD libwnck-2.30.6-r200.ebuild 1629 RMD160 a7f3177ade349ec4c1d61f0e4a96ddde9f55389e SHA1 a2e64cf83a6c3f155eabb56a73cb8ad1160e9bed SHA256 5ff1d5b8a7b430d048de94805b731b759b611d5f3e2c8f89b55f0143c06a6570 |
| 29 |
-EBUILD libwnck-2.91.6.ebuild 1421 RMD160 34922dc212ff35ea626c6ea2fac13b2f0a2d96f9 SHA1 6bef412c1da2e21febd1d908dd1346bf68e952f8 SHA256 17aab6eea2ceda045db2875f85fef4dd8c586aab6dfd88fe43d84f53a283c638 |
| 30 |
+EBUILD libwnck-2.30.6-r200.ebuild 1646 RMD160 3e249bcad4d91eab3bbac7e8bd079c55cfcc6715 SHA1 a53d1f3d6f798025e12b5b18313433635319fde8 SHA256 b7cbde42c02b2c808058a2596cb82df7b3607d0ef2b50ed38780d194d96122be |
| 31 |
+EBUILD libwnck-2.91.6.ebuild 1455 RMD160 c6819c66b5d7eee807f934fe05a52385d1d0d4b5 SHA1 aa5f587d13dcaa3ca82b935dadcc5d198adcb3fa SHA256 84fec44770bd977b2071872f025e7e21075b2c47b311672c97acd31c934479e2 |
| 32 |
|
| 33 |
diff --git a/x11-libs/libwnck/libwnck-2.30.6-r200.ebuild b/x11-libs/libwnck/libwnck-2.30.6-r200.ebuild |
| 34 |
index 145c425..3de3ecf 100644 |
| 35 |
--- a/x11-libs/libwnck/libwnck-2.30.6-r200.ebuild |
| 36 |
+++ b/x11-libs/libwnck/libwnck-2.30.6-r200.ebuild |
| 37 |
@@ -24,7 +24,7 @@ COMMON_DEPEND=">=x11-libs/gtk+-2.19.7:2[introspection?] |
| 38 |
introspection? ( >=dev-libs/gobject-introspection-0.6.14 ) |
| 39 |
startup-notification? ( >=x11-libs/startup-notification-0.4 )" |
| 40 |
RDEPEND="${COMMON_DEPEND} |
| 41 |
- x11-libs/libwnck:2.90" |
| 42 |
+ x11-libs/libwnck:3" |
| 43 |
|
| 44 |
DEPEND="${RDEPEND} |
| 45 |
sys-devel/gettext |
| 46 |
@@ -57,7 +57,7 @@ src_prepare() { |
| 47 |
src_install() { |
| 48 |
gnome2_src_install |
| 49 |
|
| 50 |
- # Avoid clash with 2.9x slot |
| 51 |
- rm "${ED}/usr/bin/wnck-urgency-monitor" || die |
| 52 |
- rm "${ED}/usr/bin/wnckprop" || die |
| 53 |
+ # Avoid clash with x11-libs/libwnck:3 slot |
| 54 |
+ rm -v "${ED}/usr/bin/wnck-urgency-monitor" || die |
| 55 |
+ rm -v "${ED}/usr/bin/wnckprop" || die |
| 56 |
} |
| 57 |
|
| 58 |
diff --git a/x11-libs/libwnck/libwnck-2.91.6.ebuild b/x11-libs/libwnck/libwnck-2.91.6.ebuild |
| 59 |
index 533987b..6273971 100644 |
| 60 |
--- a/x11-libs/libwnck/libwnck-2.91.6.ebuild |
| 61 |
+++ b/x11-libs/libwnck/libwnck-2.91.6.ebuild |
| 62 |
@@ -11,7 +11,7 @@ DESCRIPTION="A window navigation construction kit" |
| 63 |
HOMEPAGE="http://www.gnome.org/" |
| 64 |
|
| 65 |
LICENSE="LGPL-2" |
| 66 |
-SLOT="2.90" |
| 67 |
+SLOT="3" |
| 68 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" |
| 69 |
|
| 70 |
IUSE="doc +introspection startup-notification" |
| 71 |
@@ -22,7 +22,9 @@ RDEPEND=">=x11-libs/gtk+-2.91.5:3[introspection?] |
| 72 |
x11-libs/libXres |
| 73 |
x11-libs/libXext |
| 74 |
introspection? ( >=dev-libs/gobject-introspection-0.6.14 ) |
| 75 |
- startup-notification? ( >=x11-libs/startup-notification-0.4 )" |
| 76 |
+ startup-notification? ( >=x11-libs/startup-notification-0.4 ) |
| 77 |
+ |
| 78 |
+ !!<x11-libs/libwnck-2.30.6-r200:0" |
| 79 |
DEPEND="${RDEPEND} |
| 80 |
sys-devel/gettext |
| 81 |
>=dev-util/pkgconfig-0.9 |
Archives