Remove useless libtool archive _pynotify.la from site-packages. Fix building with x11-libs/libnotify >= 0.7.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

4 files changed, 54 insertions, 7 deletions

diff --git a/dev-python/notify-python/ChangeLog b/dev-python/notify-python/ChangeLog
index 769b49988b35..f0b34eb3a4dd 100644
--- a/dev-python/notify-python/ChangeLog
+++ b/dev-python/notify-python/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/notify-python
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/notify-python/ChangeLog,v 1.26 2010/09/19 17:03:49 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/notify-python/ChangeLog,v 1.27 2011/01/29 16:20:21 ssuominen Exp $
+
+  29 Jan 2011; Samuli Suominen <ssuominen@gentoo.org>
+  notify-python-0.1.1-r1.ebuild,
+  +files/notify-python-0.1.1-libnotify-0.7.patch:
+  Remove useless libtool archive _pynotify.la from site-packages. Fix building
+  with x11-libs/libnotify >= 0.7.
 
   19 Sep 2010; Raúl Porcel <armin76@gentoo.org>
   notify-python-0.1.1-r1.ebuild:
diff --git a/dev-python/notify-python/Manifest b/dev-python/notify-python/Manifest
index 568b00ec76c7..538c13579e0c 100644
--- a/dev-python/notify-python/Manifest
+++ b/dev-python/notify-python/Manifest
@@ -1,4 +1,5 @@
+AUX notify-python-0.1.1-libnotify-0.7.patch 916 RMD160 95c4520a98013a1f87f266762706ea4c3c47f1a2 SHA1 f083e44f12bfe0281fd26b2da92f2e9fc1c0bb0d SHA256 aa40124e42ab1a843c0c1e99d4f4b2e74f5fc2e9eb2a1dff4f35973a61e6c40a
 DIST notify-python-0.1.1.tar.bz2 214514 RMD160 52f5b5cc7c01be32525db7a2edc0f3dee41911ef SHA1 490693cf601793f50cef1a3c82ba75025497fc00 SHA256 7d3bbb7c3d8f56c922cc31d02ef9057a4f06998cc2fd4f3119a576fcf8d504ce
-EBUILD notify-python-0.1.1-r1.ebuild 1169 RMD160 7c6c7bac767243ea3066f41eac9503a8651b37b4 SHA1 cb43d4b6091d306e3d04fa076e9320f642afa119 SHA256 227226ac4b2b5701a40b079ea70055b625a0506db6e23bdd00bfc94bb09a287f
-MISC ChangeLog 3202 RMD160 3123adb6d73216ab09d03cf75e4deddda8390cde SHA1 57bea663f916851938232010ef0f346885da67e8 SHA256 6574373260d22e7eb626e6d1818d977e01c4af9e5b7987181a13703237c6f69f
+EBUILD notify-python-0.1.1-r1.ebuild 1301 RMD160 d06081162e2378edb966a5f3cb1b2ba9a8c307fe SHA1 21241d6a8a4df642d53495e60ecc1b503d3b7631 SHA256 29032034020ad8c58279d702dcac9abee0c31cd37f854d00546b5b70f989572b
+MISC ChangeLog 3455 RMD160 b2982934231218f3a56fda1383937b313344ea52 SHA1 e1839e3d953fa544d80aaa64de375f74d9f036b3 SHA256 3812982434f5be0b3f4dbd52f5a6ae34af04131874c15511befafd62d00c9c98
 MISC metadata.xml 264 RMD160 c3b7bdba75dde01f64441fef0610d90adca367ab SHA1 8d03c6a88770023bb63aa9b6be20b5efd3e7e70b SHA256 99d84181942576a6dccd9991e6aacb76319789bba3bf11595d51abf58488e5c0
diff --git a/dev-python/notify-python/files/notify-python-0.1.1-libnotify-0.7.patch b/dev-python/notify-python/files/notify-python-0.1.1-libnotify-0.7.patch
new file mode 100644
index 000000000000..ee146cb6fd84
--- /dev/null
+++ b/dev-python/notify-python/files/notify-python-0.1.1-libnotify-0.7.patch
@@ -0,0 +1,37 @@
+http://pkgs.fedoraproject.org/gitweb/?p=notify-python.git;a=blob_plain;f=libnotify07.patch;hb=HEAD
+
+--- src/pynotify.defs
++++ src/pynotify.defs
+@@ -38,7 +38,6 @@
+     '("const-gchar*" "summary")
+     '("const-gchar*" "message" (null-ok) (default "NULL"))
+     '("const-gchar*" "icon" (null-ok) (default "NULL"))
+-    '("GtkWidget*" "attach" (null-ok) (default "NULL"))
+   )
+ )
+ 
+@@ -53,24 +52,6 @@
+   )
+ )
+ 
+-(define-method attach_to_widget
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_attach_to_widget")
+-  (return-type "none")
+-  (parameters
+-    '("GtkWidget*" "attach")
+-  )
+-)
+-
+-(define-method attach_to_status_icon
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_attach_to_status_icon")
+-  (return-type "none")
+-  (parameters
+-    '("GtkStatusIcon*" "attach")
+-  )
+-)
+-
+ (define-method show
+   (of-object "NotifyNotification")
+   (c-name "notify_notification_show")
diff --git a/dev-python/notify-python/notify-python-0.1.1-r1.ebuild b/dev-python/notify-python/notify-python-0.1.1-r1.ebuild
index cfe1a2fde2ed..2bf84c30dcfb 100644
--- a/dev-python/notify-python/notify-python-0.1.1-r1.ebuild
+++ b/dev-python/notify-python/notify-python-0.1.1-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/notify-python/notify-python-0.1.1-r1.ebuild,v 1.17 2010/09/19 17:03:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/notify-python/notify-python-0.1.1-r1.ebuild,v 1.18 2011/01/29 16:20:21 ssuominen Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 
-inherit python
+inherit eutils python
 
 DESCRIPTION="Python bindings for libnotify"
 HOMEPAGE="http://www.galago-project.org/"
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 RESTRICT_PYTHON_ABIS="3.*"
 
 src_prepare() {
+	has_version ">=x11-libs/libnotify-0.7" && epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+
 	# Disable byte-compilation.
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile
@@ -37,6 +39,7 @@ src_prepare() {
 
 src_install() {
 	python_src_install
+	python_clean_installation_image
 	dodoc AUTHORS ChangeLog NEWS README
 }