Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/xfce-extra
diff options
context:
space:
mode:
Diffstat (limited to 'xfce-extra')
-rw-r--r--xfce-extra/pynetworkmanager/ChangeLog10
-rw-r--r--xfce-extra/pynetworkmanager/files/digest-pynetworkmanager-0.3-r1 (renamed from xfce-extra/pynetworkmanager/files/digest-pynetworkmanager-0.3)0
-rw-r--r--xfce-extra/pynetworkmanager/files/pynetworkmanager-0.3-gentoo-2.patch125
-rw-r--r--xfce-extra/pynetworkmanager/pynetworkmanager-0.3-r1.ebuild (renamed from xfce-extra/pynetworkmanager/pynetworkmanager-0.3.ebuild)14
4 files changed, 142 insertions, 7 deletions
diff --git a/xfce-extra/pynetworkmanager/ChangeLog b/xfce-extra/pynetworkmanager/ChangeLog
index ac8eb26446aa..fc735d2d9687 100644
--- a/xfce-extra/pynetworkmanager/ChangeLog
+++ b/xfce-extra/pynetworkmanager/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for xfce-extra/pynetworkmanager
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/pynetworkmanager/ChangeLog,v 1.4 2007/07/03 18:55:51 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/pynetworkmanager/ChangeLog,v 1.5 2007/07/05 18:07:10 drac Exp $
+
+*pynetworkmanager-0.3-r1 (05 Jul 2007)
+
+ 05 Jul 2007; Samuli Suominen <drac@gentoo.org>
+ +files/pynetworkmanager-0.3-gentoo-2.patch, -pynetworkmanager-0.3.ebuild,
+ +pynetworkmanager-0.3-r1.ebuild:
+ Patch to use python site-packages instead of installing .py[co] to
+ /usr/share and break.
*pynetworkmanager-0.3 (03 Jul 2007)
diff --git a/xfce-extra/pynetworkmanager/files/digest-pynetworkmanager-0.3 b/xfce-extra/pynetworkmanager/files/digest-pynetworkmanager-0.3-r1
index 5137d97e53f2..5137d97e53f2 100644
--- a/xfce-extra/pynetworkmanager/files/digest-pynetworkmanager-0.3
+++ b/xfce-extra/pynetworkmanager/files/digest-pynetworkmanager-0.3-r1
diff --git a/xfce-extra/pynetworkmanager/files/pynetworkmanager-0.3-gentoo-2.patch b/xfce-extra/pynetworkmanager/files/pynetworkmanager-0.3-gentoo-2.patch
new file mode 100644
index 000000000000..d3536db3ed07
--- /dev/null
+++ b/xfce-extra/pynetworkmanager/files/pynetworkmanager-0.3-gentoo-2.patch
@@ -0,0 +1,125 @@
+diff -ruN pyNetworkManager-0.3.orig/Makefile pyNetworkManager-0.3/Makefile
+--- pyNetworkManager-0.3.orig/Makefile 1970-01-01 02:00:00.000000000 +0200
++++ pyNetworkManager-0.3/Makefile 2007-07-05 20:50:14.000000000 +0300
+@@ -0,0 +1,39 @@
++PREFIX=/usr
++PYTHON_SITEPACKAGES=`python -c 'from distutils.sysconfig import get_python_lib; import os; print os.path.normcase(os.path.realpath(get_python_lib()))'`
++
++all: compile
++
++clean:
++ rm -f *.pyo
++ rm -f *.pyc
++
++compile:
++ python -c "import compileall; compileall.compile_dir('.')" || die "Compile failed."
++ python -O -c "import compileall; compileall.compile_dir('.')" || die "Optimization failed."
++
++make-install-dirs:
++ mkdir -p $(DESTDIR)$(PREFIX)/share/xfce4/pyNetworkManager/icons
++ mkdir -p $(DESTDIR)$(PREFIX)/share/xfce4/panel-plugins
++ mkdir -p $(DESTDIR)$(PYTHON_SITEPACKAGES)
++
++install: make-install-dirs
++ install -m 755 *.py $(DESTDIR)$(PYTHON_SITEPACKAGES)
++ install -m 644 icons/*.png $(DESTDIR)$(PREFIX)/share/xfce4/pyNetworkManager/icons
++ echo "X-XFCE-Exec=$(PYTHON_SITEPACKAGES)/pyNMxfcePanel.py" >> pyNetworkManager.desktop
++ install -m 644 pyNetworkManager.desktop $(DESTDIR)$(PREFIX)/share/xfce4/panel-plugins
++ echo "ICON_PATH = '$(PREFIX)/share/xfce4/pyNetworkManager/icons/'" > pyNetworkManagerPaths.py
++ install -m 644 pyNetworkManagerPaths.py $(DESTDIR)$(PYTHON_SITEPACKAGES)
++
++uninstall:
++ rm -rf $(DESTDIR)$(PREFIX)/share/xfce4/pyNetworkManager
++ rm -f $(DESTDIR)$(PREFIX)/share/xfce4/panel-plugins/pyNetworkManager.desktop
++ rm -f $(DESTDIR)$(PYTHON_SITEPACKAGES)/isconnected.py*
++ rm -f $(DESTDIR)$(PYTHON_SITEPACKAGES)/pyNMClient.py*
++ rm -f $(DESTDIR)$(PYTHON_SITEPACKAGES)/pyNMNets.py*
++ rm -f $(DESTDIR)$(PYTHON_SITEPACKAGES)/pyNMWin.py*
++ rm -f $(DESTDIR)$(PYTHON_SITEPACKAGES)/sysNetworkMonitor.py*
++ rm -f $(DESTDIR)$(PYTHON_SITEPACKAGES)/pyNetworkManager.py*
++ rm -f $(DESTDIR)$(PYTHON_SITEPACKAGES)/pyNMgtk.py*
++ rm -f $(DESTDIR)$(PYTHON_SITEPACKAGES)/pyNMServer.py*
++ rm -f $(DESTDIR)$(PYTHON_SITEPACKAGES)/pyNMxfcePanel.py*
++ rm -f $(DESTDIR)$(PYTHON_SITEPACKAGES)/sysNetworkSpeed.py*
+diff -ruN pyNetworkManager-0.3.orig/pyNetworkManager-0.3/Makefile pyNetworkManager-0.3/pyNetworkManager-0.3/Makefile
+--- pyNetworkManager-0.3.orig/pyNetworkManager-0.3/Makefile 1970-01-01 02:00:00.000000000 +0200
++++ pyNetworkManager-0.3/pyNetworkManager-0.3/Makefile 2007-07-05 20:48:33.000000000 +0300
+@@ -0,0 +1,41 @@
++PREFIX=/usr
++PYTHON_SITEPACKAGES=`python -c 'from distutils.sysconfig import get_python_lib; import os; print os.path.normcase(os.path.realpath(get_python_lib()))'`
++
++all: compile
++
++clean:
++ rm -f *.pyo
++ rm -f *.pyc
++
++compile:
++ python -c "import compileall; compileall.compile_dir('.')" || die "Compile failed."
++ python -O -c "import compileall; compileall.compile_dir('.')" || die "Optimization failed."
++
++make-install-dirs:
++ mkdir -p $(DESTDIR)$(PREFIX)/share/xfce4/pyNetworkManager/icons
++ mkdir -p $(DESTDIR)$(PREFIX)/share/xfce4/panel-plugins
++ mkdir -p $(DESTDIR)$(PYTHON_SITEPACKAGES)
++
++install: make-install-dirs
++ install -m 755 *.py $(DESTDIR)$(PYTHON_SITEPACKAGES)
++ install -m 644 *.pyc $(DESTDIR)$(PYTHON_SITEPACKAGES)
++ install -m 644 *.pyo $(DESTDIR)$(PYTHON_SITEPACKAGES)
++ install -m 644 icons/*.png $(DESTDIR)$(PREFIX)/share/xfce4/pyNetworkManager/icons
++ echo "X-XFCE-Exec=$(PYTHON_SITEPACKAGES)/pyNMxfcePanel.py" >> pyNetworkManager.desktop
++ install -m 644 pyNetworkManager.desktop $(DESTDIR)$(PREFIX)/share/xfce4/panel-plugins
++ echo "ICON_PATH = '$(PREFIX)/share/xfce4/pyNetworkManager/icons/'" > pyNetworkManagerPaths.py
++ install -m 644 pyNetworkManagerPaths.py $(DESTDIR)$(PYTHON_SITEPACKAGES)
++
++uninstall:
++ rm -rf $(DESTDIR)$(PREFIX)/share/xfce4/pyNetworkManager
++ rm -f $(DESTDIR)$(PREFIX)/share/xfce4/panel-plugins/pyNetworkManager.desktop
++ rm -f $(DESTDIR)$(PYTHON_SITEPACKAGES)/isconnected.py*
++ rm -f $(DESTDIR)$(PYTHON_SITEPACKAGES)/pyNMClient.py*
++ rm -f $(DESTDIR)$(PYTHON_SITEPACKAGES)/pyNMNets.py*
++ rm -f $(DESTDIR)$(PYTHON_SITEPACKAGES)/pyNMWin.py*
++ rm -f $(DESTDIR)$(PYTHON_SITEPACKAGES)/sysNetworkMonitor.py*
++ rm -f $(DESTDIR)$(PYTHON_SITEPACKAGES)/pyNetworkManager.py*
++ rm -f $(DESTDIR)$(PYTHON_SITEPACKAGES)/pyNMgtk.py*
++ rm -f $(DESTDIR)$(PYTHON_SITEPACKAGES)/pyNMServer.py*
++ rm -f $(DESTDIR)$(PYTHON_SITEPACKAGES)/pyNMxfcePanel.py*
++ rm -f $(DESTDIR)$(PYTHON_SITEPACKAGES)/sysNetworkSpeed.py*
+diff -ruN pyNetworkManager-0.3.orig/pyNetworkManager.desktop pyNetworkManager-0.3/pyNetworkManager.desktop
+--- pyNetworkManager-0.3.orig/pyNetworkManager.desktop 2007-07-01 18:14:08.000000000 +0300
++++ pyNetworkManager-0.3/pyNetworkManager.desktop 2007-07-05 20:48:36.000000000 +0300
+@@ -5,4 +5,3 @@
+ Icon=nm-device-wireless
+ Type=Panel
+ X-XFCE-Unique=true
+-X-XFCE-Exec=/home/martin/projekt/xfce/panel/pyNetworkManager/current/pyNMxfcePanel.py
+diff -ruN pyNetworkManager-0.3.orig/pyNetworkManager.py pyNetworkManager-0.3/pyNetworkManager.py
+--- pyNetworkManager-0.3.orig/pyNetworkManager.py 2007-07-01 17:12:44.000000000 +0300
++++ pyNetworkManager-0.3/pyNetworkManager.py 2007-07-05 20:48:36.000000000 +0300
+@@ -10,8 +10,11 @@
+
+ # Filesystem
+
++import os
++from distutils.sysconfig import get_python_lib
++
+ # Change to suit your system.
+-FILES_PATH='/home/martin/projekt/xfce/panel/pyNetworkManager/'
++FILES_PATH = 'os.path.normcase(os.path.realpath(get_python_lib()))'
+
+ # DBus
+ # Networkmanager
+diff -ruN pyNetworkManager-0.3.orig/pyNMgtk.py pyNetworkManager-0.3/pyNMgtk.py
+--- pyNetworkManager-0.3.orig/pyNMgtk.py 2007-07-01 15:38:24.000000000 +0300
++++ pyNetworkManager-0.3/pyNMgtk.py 2007-07-05 20:48:36.000000000 +0300
+@@ -28,8 +28,7 @@
+ ##########################################################
+ # STATUS ICON
+
+-# Default = ICON_PATH = FILES_PATH+'icons/';
+-ICON_PATH = FILES_PATH+'icons/';
++from pyNetworkManagerPaths import *
+
+ ICON_ERROR = ICON_PATH+'error.png'
+ ICON_WAIT = ICON_PATH+'working.png'
diff --git a/xfce-extra/pynetworkmanager/pynetworkmanager-0.3.ebuild b/xfce-extra/pynetworkmanager/pynetworkmanager-0.3-r1.ebuild
index c85a5f07688e..f928daff9669 100644
--- a/xfce-extra/pynetworkmanager/pynetworkmanager-0.3.ebuild
+++ b/xfce-extra/pynetworkmanager/pynetworkmanager-0.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/pynetworkmanager/pynetworkmanager-0.3.ebuild,v 1.1 2007/07/03 18:55:51 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/pynetworkmanager/pynetworkmanager-0.3-r1.ebuild,v 1.1 2007/07/05 18:07:10 drac Exp $
MY_PN="${PN/n/N}" ; MY_PN="${MY_PN/m/M}" ; MY_P="${MY_PN}-${PV}"
@@ -27,11 +27,11 @@ S="${WORKDIR}"/${MY_P}
src_unpack() {
unpack ${A}
cd "${S}"
- epatch "${FILESDIR}"/${P}-gentoo.patch
+ epatch "${FILESDIR}"/${P}-gentoo-2.patch
}
src_compile() {
- echo "Nothing to compile."
+ echo "Byte compiling in post installation."
}
src_install() {
@@ -41,9 +41,11 @@ src_install() {
pkg_postinst() {
xfce44_pkg_postinst
- python_mod_optimize /usr/share/xfce4/${MY_PN}
+ python_mod_optimize "${ROOT}"/usr/lib*/python*/site-packages
- elog "Note: This version of pyNetworkManager doesn't support encrypted networks."
+ elog "Note: This version of pyNetworkManager doesn't support encrypted networks,"
+ elog "and doesn't work with old versions so you need to remove file:"
+ elog "~/.config/pyNetworkManager/stored-networks.conf."
elog
elog "You might need to edit /etc/dbus-1/system.d/NetworkManager.conf,"
elog "into group=\"plugdev\" section:"
@@ -55,5 +57,5 @@ pkg_postinst() {
pkg_postrm() {
xfce44_pkg_postrm
- python_mod_cleanup /usr/share/xfce4/${MY_PN}
+ python_mod_cleanup "${ROOT}"/usr/lib*/python*/site-packages
}