Version bump.

(Portage version: 2.1.3_rc6)

6 files changed, 71 insertions, 42 deletions

diff --git a/xfce-extra/pynetworkmanager/ChangeLog b/xfce-extra/pynetworkmanager/ChangeLog
index 729f37063fac..ac8eb26446aa 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.3 2007/07/01 17:12:10 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/pynetworkmanager/ChangeLog,v 1.4 2007/07/03 18:55:51 drac Exp $
+
+*pynetworkmanager-0.3 (03 Jul 2007)
+
+  03 Jul 2007; Samuli Suominen <drac@gentoo.org>
+  -files/pynetworkmanager-0.2-gentoo.patch,
+  +files/pynetworkmanager-0.3-gentoo.patch, -pynetworkmanager-0.2.ebuild,
+  +pynetworkmanager-0.3.ebuild:
+  Version bump.
 
   01 Jul 2007; Samuli Suominen <drac@gentoo.org>
   -files/pynetworkmanager-gentoo.patch, -pynetworkmanager-0.1.ebuild,
diff --git a/xfce-extra/pynetworkmanager/files/digest-pynetworkmanager-0.2 b/xfce-extra/pynetworkmanager/files/digest-pynetworkmanager-0.2
deleted file mode 100644
index e49c6d19e0dc..000000000000
--- a/xfce-extra/pynetworkmanager/files/digest-pynetworkmanager-0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 76c12a21d8aacacb2c2cedc227583f6a pyNetworkManager-0.2.tar.bz2 37652
-RMD160 3429b9f3e89a4124298f977b4f3015209a187239 pyNetworkManager-0.2.tar.bz2 37652
-SHA256 7adb83432f7e4e905da672dd775fd8e344917c3402cc950e33f7d5f4ddca6473 pyNetworkManager-0.2.tar.bz2 37652
diff --git a/xfce-extra/pynetworkmanager/files/digest-pynetworkmanager-0.3 b/xfce-extra/pynetworkmanager/files/digest-pynetworkmanager-0.3
new file mode 100644
index 000000000000..5137d97e53f2
--- /dev/null
+++ b/xfce-extra/pynetworkmanager/files/digest-pynetworkmanager-0.3
@@ -0,0 +1,3 @@
+MD5 58978186dab2524f840426616e79a848 pyNetworkManager-0.3.tar.bz2 38879
+RMD160 67bf1ab662b306a230ce3c7e3ab27fb4a8789670 pyNetworkManager-0.3.tar.bz2 38879
+SHA256 2472bf0620f1f6bf9fadc791a41cbd84b59d3e8edd5d890e1a198e4474dcaa4a pyNetworkManager-0.3.tar.bz2 38879
diff --git a/xfce-extra/pynetworkmanager/files/pynetworkmanager-0.2-gentoo.patch b/xfce-extra/pynetworkmanager/files/pynetworkmanager-0.2-gentoo.patch
deleted file mode 100644
index bdbfcacd8efc..000000000000
--- a/xfce-extra/pynetworkmanager/files/pynetworkmanager-0.2-gentoo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur pyNetworkManager-0.2.orig/pyNetworkManager.desktop pyNetworkManager-0.2/pyNetworkManager.desktop
---- pyNetworkManager-0.2.orig/pyNetworkManager.desktop	2007-06-29 22:19:30.000000000 +0300
-+++ pyNetworkManager-0.2/pyNetworkManager.desktop	2007-07-01 09:32:57.000000000 +0300
-@@ -1,8 +1,8 @@
- [Xfce Panel]
- Encoding=UTF-8
--Name=Network Mangager
-+Name=Network Manager
- Comment=Easy network manager also displaying network information
- Icon=nm-device-wireless
- Type=Panel
- X-XFCE-Unique=true
--X-XFCE-Exec=/home/martin/projekt/xfce/panel/pyNetworkManager/current/pyNMxfcePanel.py
-+X-XFCE-Exec=/usr/share/xfce4/pyNetworkManager/pyNMxfcePanel.py
-diff -ur pyNetworkManager-0.2.orig/pyNetworkManager.py pyNetworkManager-0.2/pyNetworkManager.py
---- pyNetworkManager-0.2.orig/pyNetworkManager.py	2007-06-29 22:06:16.000000000 +0300
-+++ pyNetworkManager-0.2/pyNetworkManager.py	2007-07-01 09:31:49.000000000 +0300
-@@ -11,7 +11,7 @@
- # Filesystem
- 
- # Change to suit your system.
--FILES_PATH='/home/martin/projekt/xfce/panel/pyNetworkManager/'
-+FILES_PATH='/usr/share/xfce4/pyNetworkManager/'
- 
- # DBus
- #  Networkmanager
diff --git a/xfce-extra/pynetworkmanager/files/pynetworkmanager-0.3-gentoo.patch b/xfce-extra/pynetworkmanager/files/pynetworkmanager-0.3-gentoo.patch
new file mode 100644
index 000000000000..8e4256036223
--- /dev/null
+++ b/xfce-extra/pynetworkmanager/files/pynetworkmanager-0.3-gentoo.patch
@@ -0,0 +1,57 @@
+diff -Nur pyNetworkManager-0.3.orig/LICENCE pyNetworkManager-0.3/LICENCE
+--- pyNetworkManager-0.3.orig/LICENCE	2007-06-29 22:35:11.000000000 +0300
++++ pyNetworkManager-0.3/LICENCE	1970-01-01 02:00:00.000000000 +0200
+@@ -1,5 +0,0 @@
+-pyNetworkManager:
+-Copyrigt: Martin Forsgren, mk0foma@student.chalmers.se
+-Lisence: GPL v2.
+-
+-No garanties as usual.
+diff -Nur pyNetworkManager-0.3.orig/LICENSE pyNetworkManager-0.3/LICENSE
+--- pyNetworkManager-0.3.orig/LICENSE	1970-01-01 02:00:00.000000000 +0200
++++ pyNetworkManager-0.3/LICENSE	2007-06-29 22:35:11.000000000 +0300
+@@ -0,0 +1,5 @@
++pyNetworkManager:
++Copyrigt: Martin Forsgren, mk0foma@student.chalmers.se
++Lisence: GPL v2.
++
++No garanties as usual.
+diff -Nur 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-03 21:16:09.000000000 +0300
+@@ -0,0 +1,14 @@
++PREFIX=/usr
++
++make-install-dirs: 
++	mkdir -p $(DESTDIR)$(PREFIX)/share/xfce4/pyNetworkManager/icons
++	mkdir -p $(DESTDIR)$(PREFIX)/share/xfce4/panel-plugins
++
++install: make-install-dirs
++	install -m 755 *.py $(DESTDIR)$(PREFIX)/share/xfce4/pyNetworkManager
++	install -m 644 icons/*.png $(DESTDIR)$(PREFIX)/share/xfce4/pyNetworkManager/icons
++	install -m 644 pyNetworkManager.desktop $(DESTDIR)$(PREFIX)/share/xfce4/panel-plugins
++	
++uninstall:
++	rm -rf $(DESTDIR)$(PREFIX)/share/xfce4/pyNetworkManager
++	rm -rr $(DESTDIR)$(PREFIX)/share/xfce4/panel-plugins/pyNetworkManager.desktop
+diff -Nur 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-03 21:29:34.000000000 +0300
+@@ -5,4 +5,4 @@
+ Icon=nm-device-wireless
+ Type=Panel
+ X-XFCE-Unique=true
+-X-XFCE-Exec=/home/martin/projekt/xfce/panel/pyNetworkManager/current/pyNMxfcePanel.py
++X-XFCE-Exec=/usr/share/xfce4/pyNetworkManager/pyNMxfcePanel.py
+diff -Nur 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-03 21:30:25.000000000 +0300
+@@ -11,7 +11,7 @@
+ # Filesystem
+ 
+ # Change to suit your system.
+-FILES_PATH='/home/martin/projekt/xfce/panel/pyNetworkManager/'
++FILES_PATH='/usr/share/xfce4/pyNetworkManager/'
+ 
+ # DBus
+ #  Networkmanager
diff --git a/xfce-extra/pynetworkmanager/pynetworkmanager-0.2.ebuild b/xfce-extra/pynetworkmanager/pynetworkmanager-0.3.ebuild
index 8a57d34138de..c85a5f07688e 100644
--- a/xfce-extra/pynetworkmanager/pynetworkmanager-0.2.ebuild
+++ b/xfce-extra/pynetworkmanager/pynetworkmanager-0.3.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.2.ebuild,v 1.2 2007/07/01 17:12:10 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/pynetworkmanager/pynetworkmanager-0.3.ebuild,v 1.1 2007/07/03 18:55:51 drac Exp $
 
 MY_PN="${PN/n/N}" ; MY_PN="${MY_PN/m/M}" ; MY_P="${MY_PN}-${PV}"
 
@@ -35,15 +35,7 @@ src_compile() {
 }
 
 src_install() {
-	exeinto /usr/share/xfce4/${MY_PN}
-	doexe *.py
-
-	insinto /usr/share/xfce4/${MY_PN}/icons
-	doins icons/*.png
-
-	insinto /usr/share/xfce4/panel-plugins
-	doins ${MY_PN}.desktop
-
+	emake DESTDIR="${D}" install || die "emake install failed."
 	use doc && dohtml *.html *.png
 }
 
@@ -51,7 +43,6 @@ pkg_postinst() {
 	xfce44_pkg_postinst
 	python_mod_optimize /usr/share/xfce4/${MY_PN}
 
-	elog
 	elog "Note: This version of pyNetworkManager doesn't support encrypted networks."
 	elog
 	elog "You might need to edit /etc/dbus-1/system.d/NetworkManager.conf,"
@@ -60,7 +51,6 @@ pkg_postinst() {
 	elog "<allow own=\"org.freedesktop.NetworkManagerInfo\"/>"
 	elog
 	elog "And restart system dbus after: /etc/init.d/dbus restart."
-	elog
 }
 
 pkg_postrm() {