Patch to use python site-packages instead of installing .py[co] to /usr/share and break. Next is media-sound/exaile..

Package-Manager: portage-2.1.3_rc6

5 files changed, 157 insertions, 18 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/Manifest b/xfce-extra/pynetworkmanager/Manifest
index 9cb645a37bd6..5a9fd589f6c6 100644
--- a/xfce-extra/pynetworkmanager/Manifest
+++ b/xfce-extra/pynetworkmanager/Manifest
@@ -1,20 +1,24 @@
+AUX pynetworkmanager-0.3-gentoo-2.patch 5873 RMD160 c5834097bf1e00bcc2f6313674badeffd6adaf56 SHA1 383852b140ed7663bc0ad6f38d640be253ee54af SHA256 c47ab5c454a3b5c8a889513239de6b86185de25db312dc1656137e751912702b
+MD5 64b4f9d06832d7a686006f70369c0c5e files/pynetworkmanager-0.3-gentoo-2.patch 5873
+RMD160 c5834097bf1e00bcc2f6313674badeffd6adaf56 files/pynetworkmanager-0.3-gentoo-2.patch 5873
+SHA256 c47ab5c454a3b5c8a889513239de6b86185de25db312dc1656137e751912702b files/pynetworkmanager-0.3-gentoo-2.patch 5873
 AUX pynetworkmanager-0.3-gentoo.patch 2503 RMD160 cf6d1ccfed7c2eaf4ad2a56f28f4abcd30dd604c SHA1 3ad2d2e2c9f4b0ae985ced6ac7ebaf445e3403a5 SHA256 1de251520ec6ee457990dc063073c1728a65a89b2cbf22ce9a394ae6a1cbc567
 MD5 36186e491595a0138a41ccc510a9f02f files/pynetworkmanager-0.3-gentoo.patch 2503
 RMD160 cf6d1ccfed7c2eaf4ad2a56f28f4abcd30dd604c files/pynetworkmanager-0.3-gentoo.patch 2503
 SHA256 1de251520ec6ee457990dc063073c1728a65a89b2cbf22ce9a394ae6a1cbc567 files/pynetworkmanager-0.3-gentoo.patch 2503
 DIST pyNetworkManager-0.3.tar.bz2 38879 RMD160 67bf1ab662b306a230ce3c7e3ab27fb4a8789670 SHA1 12746ea30529c90c51c158706f3e42cdba6ebf88 SHA256 2472bf0620f1f6bf9fadc791a41cbd84b59d3e8edd5d890e1a198e4474dcaa4a
-EBUILD pynetworkmanager-0.3.ebuild 1508 RMD160 91d91a46b75d7d5f71491eaa97a6831d5aa56aaa SHA1 e273da0f7d6f630f376d687e6fcae0f036a1327d SHA256 c7fe8351341a96a9593c1f8a6211b262b89022b85fe70b978c7e0a670ee182f2
-MD5 993c169a179eaa89f1dcdc5219006546 pynetworkmanager-0.3.ebuild 1508
-RMD160 91d91a46b75d7d5f71491eaa97a6831d5aa56aaa pynetworkmanager-0.3.ebuild 1508
-SHA256 c7fe8351341a96a9593c1f8a6211b262b89022b85fe70b978c7e0a670ee182f2 pynetworkmanager-0.3.ebuild 1508
-MISC ChangeLog 1060 RMD160 17d66a0e6f06dedac94539582605f066971670da SHA1 a8e02e0f40ceadc1b1002d4e14884c95f182968c SHA256 fa0c7b7f8bfe556925d694285274b2838ee8f5fc473f0b03e6024c7f63c90a61
-MD5 31c9a9b29db7abd792a0ffd94bf3f271 ChangeLog 1060
-RMD160 17d66a0e6f06dedac94539582605f066971670da ChangeLog 1060
-SHA256 fa0c7b7f8bfe556925d694285274b2838ee8f5fc473f0b03e6024c7f63c90a61 ChangeLog 1060
+EBUILD pynetworkmanager-0.3-r1.ebuild 1688 RMD160 8f09b5c128d36b8d89ffcdacd6bfbef7812d4aef SHA1 abc3e45e21e2064838d9f2b171322c3fb37be59a SHA256 b8437430f1ee2a8f6fed860e58a5153a8f2728f987fa73f867bbd65da1204351
+MD5 e2c06cbc3f1e45add395adc1e69b6f4b pynetworkmanager-0.3-r1.ebuild 1688
+RMD160 8f09b5c128d36b8d89ffcdacd6bfbef7812d4aef pynetworkmanager-0.3-r1.ebuild 1688
+SHA256 b8437430f1ee2a8f6fed860e58a5153a8f2728f987fa73f867bbd65da1204351 pynetworkmanager-0.3-r1.ebuild 1688
+MISC ChangeLog 1354 RMD160 8aab7eee6f697e18830d783939c9b225351a3432 SHA1 8202646f1a339f8e10a42f720af3cfb7d136138f SHA256 19b72e399bbf863c178b1f5010c4d2d42363ef10b2b1bc5b83c2f3cfe97c39b0
+MD5 da5904998f407afb5124d04dabedbf5e ChangeLog 1354
+RMD160 8aab7eee6f697e18830d783939c9b225351a3432 ChangeLog 1354
+SHA256 19b72e399bbf863c178b1f5010c4d2d42363ef10b2b1bc5b83c2f3cfe97c39b0 ChangeLog 1354
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 metadata.xml 157
-MD5 2b2036e5f62dc1321eee879df38868d9 files/digest-pynetworkmanager-0.3 262
-RMD160 20705987dd0d080a089f01f17f696b842b3abef1 files/digest-pynetworkmanager-0.3 262
-SHA256 f46e3161c2140a5d1a3abcb1396dbe964dcff59139cffae52f68568cc388059d files/digest-pynetworkmanager-0.3 262
+MD5 2b2036e5f62dc1321eee879df38868d9 files/digest-pynetworkmanager-0.3-r1 262
+RMD160 20705987dd0d080a089f01f17f696b842b3abef1 files/digest-pynetworkmanager-0.3-r1 262
+SHA256 f46e3161c2140a5d1a3abcb1396dbe964dcff59139cffae52f68568cc388059d files/digest-pynetworkmanager-0.3-r1 262
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
 }