From d8db2929f75d4f7c2a5f053f2ad60194073ecced Mon Sep 17 00:00:00 2001 From: "David Grant (dgrant)" Date: Tue, 26 Sep 2006 07:07:59 +0000 Subject: net-mail/gmail-notify: Added ubuntu patches (without which gmail-notify was somewhat broken), added patch to use gnome-python-extras instead, and clean up ebuild svn path=/sunrise/; revision=1343 --- net-mail/gmail-notify/ChangeLog | 6 +++ net-mail/gmail-notify/Manifest | 24 +++++++---- .../gmail-notify/files/gmail-notify-trayicon.patch | 21 +++++++++ .../files/gmail-notify-ubuntu-patches.patch | 50 ++++++++++++++++++++++ net-mail/gmail-notify/gmail-notify-1.6.1.ebuild | 21 +++++---- 5 files changed, 105 insertions(+), 17 deletions(-) create mode 100644 net-mail/gmail-notify/files/gmail-notify-trayicon.patch create mode 100644 net-mail/gmail-notify/files/gmail-notify-ubuntu-patches.patch (limited to 'net-mail') diff --git a/net-mail/gmail-notify/ChangeLog b/net-mail/gmail-notify/ChangeLog index 8d3149aae..b3d0f0af0 100644 --- a/net-mail/gmail-notify/ChangeLog +++ b/net-mail/gmail-notify/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 26 Sep 2006; David Grant (dgrant) + gmail-notify-1.6.1.ebuild, +files/gmail-notify-trayicon.patch, + +files/gmail-notify-ubuntu-patches.patch: + Added ubuntu patches (without which gmail-notify was somewhat broken), added + patch to use gnome-python-extras instead, and clean up ebuild + 11 Aug 2006; Jakub Moc gmail-notify-1.6.1.ebuild: Add RESTRICT="strip" diff --git a/net-mail/gmail-notify/Manifest b/net-mail/gmail-notify/Manifest index 43c26fb1b..caedcffd2 100644 --- a/net-mail/gmail-notify/Manifest +++ b/net-mail/gmail-notify/Manifest @@ -1,12 +1,20 @@ +AUX gmail-notify-trayicon.patch 696 RMD160 51b69fedf84f3b9b7ad88dc70809bd1c88ef065e SHA1 89c6a6766a3a0d04de4218bddaf36746357ce067 SHA256 856e020a4604880050fea5d1137273720e75545d49cc950de75e2d90076ba1cf +MD5 3210db0cc134101ea6068498c725423d files/gmail-notify-trayicon.patch 696 +RMD160 51b69fedf84f3b9b7ad88dc70809bd1c88ef065e files/gmail-notify-trayicon.patch 696 +SHA256 856e020a4604880050fea5d1137273720e75545d49cc950de75e2d90076ba1cf files/gmail-notify-trayicon.patch 696 +AUX gmail-notify-ubuntu-patches.patch 1884 RMD160 af0d473d2c85980d1d1d47cbda5e75a5144ee8db SHA1 41ff1de962a762a5ccf632e52fa0a81a3ce7972c SHA256 48d30024c402eea2311a4950f04bf1fde5e202a5deaae5ad160d5c9d8897bf78 +MD5 6d1d743598ae3f53da04913c60017456 files/gmail-notify-ubuntu-patches.patch 1884 +RMD160 af0d473d2c85980d1d1d47cbda5e75a5144ee8db files/gmail-notify-ubuntu-patches.patch 1884 +SHA256 48d30024c402eea2311a4950f04bf1fde5e202a5deaae5ad160d5c9d8897bf78 files/gmail-notify-ubuntu-patches.patch 1884 DIST gmail-notify-1.6.1.tar.gz 26348 RMD160 2589814c80d808449310315c7cb9c4c7fe01e05e SHA1 8f5c075607b3e5c4f71a7ecc8c717d8736f37462 SHA256 e97c69a60443bf24c1bc404e85f4fe2bb525e91e80e7d6b5d710b00dcc51507d -EBUILD gmail-notify-1.6.1.ebuild 1522 RMD160 d40168013e1de36c729532d4eabd2cabb0930b6c SHA1 5ce6eb29eb454115bee636d546a0a52aada4defd SHA256 b35321958d9b6eaaf8bfaad8a54ca68a0b805e4cc9085bf338d7f4401ef26964 -MD5 9651ee45436a34631eb849ba4f81259b gmail-notify-1.6.1.ebuild 1522 -RMD160 d40168013e1de36c729532d4eabd2cabb0930b6c gmail-notify-1.6.1.ebuild 1522 -SHA256 b35321958d9b6eaaf8bfaad8a54ca68a0b805e4cc9085bf338d7f4401ef26964 gmail-notify-1.6.1.ebuild 1522 -MISC ChangeLog 434 RMD160 9ecd44b3895d471beec89290c1fe56bf73a76b21 SHA1 a193e63985152310451d55389291e50eaa542ea4 SHA256 5bca0cfc4ec2ebcba7fa6aba857a988a1c2f3ee0173fec4b716f17e56f38a97a -MD5 3e32f4c1b9bccab0eba1fe87b94bda40 ChangeLog 434 -RMD160 9ecd44b3895d471beec89290c1fe56bf73a76b21 ChangeLog 434 -SHA256 5bca0cfc4ec2ebcba7fa6aba857a988a1c2f3ee0173fec4b716f17e56f38a97a ChangeLog 434 +EBUILD gmail-notify-1.6.1.ebuild 1586 RMD160 05393eb3fb52de5009bec8ccd0ab76de39aa35b7 SHA1 7821ee8de7ca4be86dd4a2d87e8d837950efe1a2 SHA256 02ef4d8af21b2a59d6918dd854544dc9069aa93673c592f0ca3f9133f890b971 +MD5 144bcf6fa3b07bea5562aef27c649325 gmail-notify-1.6.1.ebuild 1586 +RMD160 05393eb3fb52de5009bec8ccd0ab76de39aa35b7 gmail-notify-1.6.1.ebuild 1586 +SHA256 02ef4d8af21b2a59d6918dd854544dc9069aa93673c592f0ca3f9133f890b971 gmail-notify-1.6.1.ebuild 1586 +MISC ChangeLog 746 RMD160 b6ed8214c7f888e41c2289d5421fa2aac1d92bc5 SHA1 eca937016a15a9a83134ea0c23a179c26eb3e109 SHA256 03037eefc655a5f9051dc46df1331048b475f60cf79b7dc93c0028de1442f05c +MD5 5ba71ab4fea5927c8f9ccae692a2bc89 ChangeLog 746 +RMD160 b6ed8214c7f888e41c2289d5421fa2aac1d92bc5 ChangeLog 746 +SHA256 03037eefc655a5f9051dc46df1331048b475f60cf79b7dc93c0028de1442f05c ChangeLog 746 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170 diff --git a/net-mail/gmail-notify/files/gmail-notify-trayicon.patch b/net-mail/gmail-notify/files/gmail-notify-trayicon.patch new file mode 100644 index 000000000..e630b67e9 --- /dev/null +++ b/net-mail/gmail-notify/files/gmail-notify-trayicon.patch @@ -0,0 +1,21 @@ +diff -u gmail-notify.orig/notifier.py gmail-notify/notifier.py +--- gmail-notify.orig/notifier.py 2006-09-25 23:23:50.000000000 -0700 ++++ gmail-notify/notifier.py 2006-09-25 23:40:10.000000000 -0700 +@@ -6,7 +6,7 @@ + import gtk + import time + import os +-import pytrayicon ++from egg.trayicon import TrayIcon + import sys + import warnings + import ConfigParser +@@ -82,7 +82,7 @@ + self.popuptimer=0 + self.waittimer=0 + # Create the tray icon object +- self.tray = pytrayicon.TrayIcon(self.lang.get_string(21)); ++ self.tray = TrayIcon(self.lang.get_string(21)); + self.eventbox = gtk.EventBox() + self.tray.add(self.eventbox) + self.eventbox.connect("button_press_event", self.tray_icon_clicked) diff --git a/net-mail/gmail-notify/files/gmail-notify-ubuntu-patches.patch b/net-mail/gmail-notify/files/gmail-notify-ubuntu-patches.patch new file mode 100644 index 000000000..e0396ea0d --- /dev/null +++ b/net-mail/gmail-notify/files/gmail-notify-ubuntu-patches.patch @@ -0,0 +1,50 @@ +diff -u gmail-notify.orig/GmailConfig.py gmail-notify/GmailConfig.py +--- gmail-notify.orig/GmailConfig.py 2006-09-25 23:23:50.000000000 -0700 ++++ gmail-notify/GmailConfig.py 2006-09-25 23:36:22.000000000 -0700 +@@ -9,8 +9,8 @@ + import xmllangs + import sys + +-LANGSXML_PATH=sys.path[0]+"/langs.xml" +-ICON_PATH=sys.path[0]+"/gmail-notify-icon.png" ++LANGSXML_PATH="/usr/lib/pythonGENTOO_PYVER/site-packages/gmail-notify/langs.xml" ++ICON_PATH="/usr/lib/pythonGENTOO_PYVER/site-packages/gmail-notify/gmail-notify-icon.png" + + class GmailConfigWindow: + +@@ -131,12 +131,12 @@ + # Attach combobox and label + table.attach( self.lbl_langs, 0, 1, 8, 9 ) + self.lbl_langs.show() +- table.attach( self.cbo_langs, 1, 2, 8, 9, ypadding=5 ) ++ table.attach( self.cbo_langs, 1, 2, 8, 9, xpadding=5, ypadding=5 ) + self.cbo_langs.show() + + # Add 'Close' button + button = gtk.Button( stock=gtk.STOCK_OK ) +- table.attach( button, 0, 2, 10, 11, ypadding=2 ) ++ table.attach( button, 0, 2, 10, 11, xpadding=2, ypadding=2 ) + button.connect( "clicked", self.onOkay ) + button.show() + +diff -u gmail-notify.orig/notifier.py gmail-notify/notifier.py +--- gmail-notify.orig/notifier.py 2006-09-25 23:23:50.000000000 -0700 ++++ gmail-notify/notifier.py 2006-09-25 23:35:50.000000000 -0700 +@@ -8,6 +8,7 @@ + import os + import pytrayicon + import sys ++sys.path.insert (0, "/usr/lib/pythonGENTOO_PYVER/site-packages/gmail-notify/") + import warnings + import ConfigParser + import xmllangs +@@ -18,6 +19,9 @@ + BKG_PATH=sys.path[0]+"/background.jpg" + ICON_PATH=sys.path[0]+"/icon.png" + ICON2_PATH=sys.path[0]+"/icon2.png" ++BKG_PATH="/usr/lib/pythonGENTOO_PYVER/site-packages/gmail-notify/background.jpg" ++ICON_PATH="/usr/lib/pythonGENTOO_PYVER/site-packages/gmail-notify/icon.png" ++ICON2_PATH="/usr/lib/pythonGENTOO_PYVER/site-packages/gmail-notify/icon2.png" + + def removetags(text): + raw=text.split("") diff --git a/net-mail/gmail-notify/gmail-notify-1.6.1.ebuild b/net-mail/gmail-notify/gmail-notify-1.6.1.ebuild index 4a9a6f99f..bcb4acd0b 100644 --- a/net-mail/gmail-notify/gmail-notify-1.6.1.ebuild +++ b/net-mail/gmail-notify/gmail-notify-1.6.1.ebuild @@ -14,28 +14,31 @@ KEYWORDS="~x86" IUSE="" RESTRICT="strip" -RDEPEND="virtual/python - >=dev-python/pygtk-2.0 - >=x11-libs/gtk+-2.4" +RDEPEND="dev-python/gnome-python-extras + >=dev-python/pygtk-2.0" DEPEND="${RDEPEND}" S=${WORKDIR}/${PN} +src_unpack() { + python_version + unpack ${A} + epatch "${FILESDIR}/${PN}-trayicon.patch" + epatch "${FILESDIR}/${PN}-ubuntu-patches.patch" + cd ${S} + sed -i -e "s/GENTOO_PYVER/${PYVER}/g" notifier.py || die "Sed broke!" + sed -i -e "s/GENTOO_PYVER/${PYVER}/g" GmailConfig.py || die "Sed broke!" +} + src_install() { python_version INST_DIR=/usr/lib/python${PYVER}/site-packages/${PN} - #Install docs dodoc README - #Install all python files into site-packages insinto ${INST_DIR} doins *.py *.jpg *.png langs.xml pytrayicon.so notifier.conf.sample - #Install a script in /usr/bin - echo "#!/bin/bash" > gmail-notify - echo "exec /usr/bin/python ${INST_DIR}/notifier.py \"\$1\"" >> gmail-notify - dobin gmail-notify make_wrapper gmail-notify "/usr/bin/python ${INST_DIR}/notifier.py" } -- cgit v1.2.3