rework install-script (fix permissions and doc dest)

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

4 files changed, 56 insertions, 30 deletions

diff --git a/x11-misc/wbarconf/ChangeLog b/x11-misc/wbarconf/ChangeLog
index 34f7f5f8df5b..56fbd1f4c33b 100644
--- a/x11-misc/wbarconf/ChangeLog
+++ b/x11-misc/wbarconf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/wbarconf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbarconf/ChangeLog,v 1.3 2012/05/14 17:56:32 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbarconf/ChangeLog,v 1.4 2012/06/17 14:32:36 hasufell Exp $
+
+*wbarconf-0.7.2.2-r1 (17 Jun 2012)
+
+  17 Jun 2012; Julian Ospald <hasufell@gentoo.org> -wbarconf-0.7.2.2.ebuild,
+  +wbarconf-0.7.2.2-r1.ebuild, files/wbarconf-0.7.2.2-install.patch:
+  rework install-script (fix permissions and doc dest)
 
   14 May 2012; Julian Ospald <hasufell@gentoo.org> -wbarconf-0.7.2.ebuild,
   -files/wbarconf-0.7.2-install.patch:
diff --git a/x11-misc/wbarconf/Manifest b/x11-misc/wbarconf/Manifest
index 003c1d35fd2e..c6d57b98e417 100644
--- a/x11-misc/wbarconf/Manifest
+++ b/x11-misc/wbarconf/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX wbarconf-0.7.2.2-install.patch 1910 RMD160 349f35eee2bfe947cef2fabf2de546b27eeee9c6 SHA1 7e0343dbbdb57601b25aba04de6f2d748c2e187c SHA256 bbe3e127b6aaf99f8a612bbd670d1d5851e05c6750c4754fe8656dc2416eb3cf
+AUX wbarconf-0.7.2.2-install.patch 2843 RMD160 d90f479a0268a658d78431d8eef2d85f0a81160d SHA1 881273e313c2f84ec0a353fd2b7d5a293379de26 SHA256 07ef20ca349b47a65143b07c4e835a77d2463b0ff955dd9a4ead861aa89d35eb
 DIST wbarconf-0.7.2.2.tar.gz 764073 RMD160 e1d4123fd9e31dafa1f092b0c24915aa6b384ec7 SHA1 507a923c449b74d9a4d682689701920fea07b8a3 SHA256 d0d0722b8db107983d22a0d4d00679d55ad0800ea81f3ce29869ee4f864c6089
-EBUILD wbarconf-0.7.2.2.ebuild 750 RMD160 be077c2a5e0fd14490e43fbe6bdcb4491c32e5c4 SHA1 e5e0adf67396077011ecd7438d77a4241fdcfb40 SHA256 4697cddf613b65ac65721c8dd202e12a75457b047f15b32ad0ba8fa653de2628
-MISC ChangeLog 690 RMD160 24476188d6ede920ac7f6db0a882384a5b4ac61e SHA1 769a29a0ec780dcf2e07bce91836f2018d891d3f SHA256 2938cedb2070e3e9261c09559f6dc13375971c37960fd71ecd788030d2864847
+EBUILD wbarconf-0.7.2.2-r1.ebuild 753 RMD160 8f3794c12faf80279a4717b00ade8937cea5d3d9 SHA1 9f39ba6afddeb182ad9a08c6177099a4a831120e SHA256 b1823c75fbd9d187d71830a3deb01ca1c93a52a325cba9102d62f9e75a217b1d
+MISC ChangeLog 928 RMD160 4a5b5b348b13a3446bd10c04981c481c85675c91 SHA1 640ef12a6c9f91a6b8525a1961ecbd1b26866b5b SHA256 8cc2e4e7b3bcc45c15c13f8d2d21f3eacb27e78959a9892c9afaf285fbc43d16
 MISC metadata.xml 261 RMD160 dbc736f64f35a142b61d4d31e365e974020fd8d6 SHA1 375cafb06e6b25c0adbe381dd9a1fea696cc4c4b SHA256 54aad0c7aa5dee1aa9c910db5c03722c0bd8565e3b6ada7986207acf0e7c1e44
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPsUbSAAoJEFpvPKfnPDWzKjUIALTFpB8K/4S3eP7Q8oJE6w1m
-5fCUaIw7SC8+NBcQDhLD0G5JDTBvLvDCnRd7ZZGdDDwLPHapegh9ElgZcgzihQXC
-1u9NFa/aCbARqsnNN//hCyNjOhfUSa6qSYhhLkkIWARMh2d/O3it65m64NQ26dp+
-pGbqGkXguvLKYWDLr7CtlB0Zdi8pVgGx1uGxPa9ZzZU8uvMyx5qIHqLnNmGgjIMn
-Gu3lS9jd7VJTn+Wk/T7osVmcBBD3ZRFY2OQBw6YeDp7PhMvvMVOkas4SnXSHpVcb
-KMgmrablj8sauSRP+RsoGIAMB92vU0Qrghe3ryCI7RvcWmaPC47uaIg4fC+o/IM=
-=oK8r
+iQEcBAEBAgAGBQJP3enPAAoJEFpvPKfnPDWzPKAIAJuzQHguJ1rOvN78lA5K0MiQ
+WYR36KCBrhfIglLB/VNeihpiXXDXlPdoUC75w2YBA4l0n+Hhv8e0Xs+lJgIJnIym
+iPa2TZIgl4tFmqayZUbAipvrOGuoafBXZr/NdBNlnjr6EmEOZUYsA+BaQeTSdlbt
+oSvpzIi6y/PUOU5Fee0m3Y1p7CnM4Mh7vjdNOnP1+U5reox1NzAsTb81ehxrlqpQ
+bBNPOHzBa5ESWKdhLzcmKkoA3Mdofa9kLVbOc6YXnBCIxc09X2rrulRESDZdpTh0
+Xn4/AV4K+8QadVZXYKWAVFcv4BbXRJ5+VI8POOyeu52VE5PiRNTb/IqryoaAtuY=
+=xN9z
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/wbarconf/files/wbarconf-0.7.2.2-install.patch b/x11-misc/wbarconf/files/wbarconf-0.7.2.2-install.patch
index fd9ae786412f..040d435bc797 100644
--- a/x11-misc/wbarconf/files/wbarconf-0.7.2.2-install.patch
+++ b/x11-misc/wbarconf/files/wbarconf-0.7.2.2-install.patch
@@ -3,36 +3,56 @@
 @@ -1,5 +1,6 @@
  #!/bin/sh
  startdir=$1
-+version=0.7.2
++version=0.7.2.2
  
  if [ $(echo $1|wc -w) -eq 0 ];then
  	echo "Usage: install.sh /path/to"
-@@ -14,17 +15,20 @@
- mkdir -p $startdir/bin/ || return 1
- install -m0755 wbarconf $startdir/bin/ || return 1
+@@ -8,29 +9,28 @@
+ 	exit 1
+ fi
+ 
+-echo "Installing in to $startdir..."
++echo "Installing in to ${startdir}..."
+ 
++cd "$(dirname "$(readlink -f "$0")")" || exit 1
+ 
+-mkdir -p $startdir/bin/ || return 1
+-install -m0755 wbarconf $startdir/bin/ || return 1
++mkdir -p "${startdir}"/bin/ || exit 1
++install -m0755 wbarconf "${startdir}"/bin/ || exit 1
  
 -mkdir -p $startdir/share/wbarconf/
 -install -m0644 README $startdir/share/wbarconf/ || return 1
 -install -m0644 COPYING $startdir/share/wbarconf/ || return 1
-+mkdir -p $startdir/share/doc/wbarconf-$version/wbarbacks/
-+install -m0644 README $startdir/share/doc/wbarconf-$version/ || return 1
-+install -m0644 wbarbacks/README $startdir/share/doc/wbarconf-$version/wbarbacks/ || return 1
++mkdir -p "${startdir}"/share/doc/wbarconf-${version}/wbarbacks/ || exit 1
++install -m0644 README "${startdir}"/share/doc/wbarconf-${version}/ || exit 1
++install -m0644 wbarbacks/README "${startdir}"/share/doc/wbarconf-${version}/wbarbacks/ || exit 1
  
- mkdir -p $startdir/share/locale/ || return 1
+-mkdir -p $startdir/share/locale/ || return 1
 -cp -av locale/* $startdir/share/locale/ || return 1
-+cp -dpRv locale/* $startdir/share/locale/ || return 1
- chmod 0755 -R  $startdir/share/ || return 1
- find $startdir/share/locale/ -name wbarconf.po -print | xargs rm -f
-+
-+mkdir -p $startdir/share/wbarconf/
- install -m0644 messages.pot $startdir/share/wbarconf/ || return 1
+-chmod 0755 -R  $startdir/share/ || return 1
+-find $startdir/share/locale/ -name wbarconf.po -print | xargs rm -f
+-install -m0644 messages.pot $startdir/share/wbarconf/ || return 1
++find . -type d -name LC_MESSAGES -exec mkdir -p "${startdir}/share/{}" \; || exit 1
++find . -type f -name wbarconf.mo -exec install -m0644 '{}' "${startdir}/share/{}" \; || exit 1
  
 -cp -av wbarbacks $startdir/share/wbarconf/ || return 1
-+mkdir -p $startdir/share/wbarconf/wbarbacks/
-+cp -dpRv wbarbacks/*.png $startdir/share/wbarconf/wbarbacks/ || return 1
- chmod 0655 -R  $startdir/share/wbarconf/ || return 1
+-chmod 0655 -R  $startdir/share/wbarconf/ || return 1
++mkdir -p "${startdir}"/share/wbarconf/wbarbacks/ || exit 1
++install -m0644 messages.pot "${startdir}"/share/wbarconf/ || exit 1
++find ./wbarbacks -type f -name "*.png" -exec install -m0644 '{}' "${startdir}/share/wbarconf/{}" \; || exit 1
+ 
+-mkdir -p $startdir/share/pixmaps/
+-install -m0644 wbarconf.png $startdir/share/pixmaps/ || return 1
++mkdir -p "${startdir}"/share/pixmaps/ || exit 1
++install -m0644 wbarconf.png "${startdir}"/share/pixmaps/ || exit 1
+ 
+-mkdir -p $startdir/share/applications/
+-install -m0644 wbarconf.desktop $startdir/share/applications/ || return 1
++mkdir -p "${startdir}"/share/applications/ || exit 1
++install -m0644 wbarconf.desktop "${startdir}"/share/applications/ || exit 1
  
- mkdir -p $startdir/share/pixmaps/
+ echo "Installation complete."
 --- wbarconf/wbarconf.desktop
 +++ wbarconf/wbarconf.desktop
 @@ -2,10 +2,10 @@
diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r1.ebuild
index fc2873ca29af..1fc40a9a9db2 100644
--- a/x11-misc/wbarconf/wbarconf-0.7.2.2.ebuild
+++ b/x11-misc/wbarconf/wbarconf-0.7.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbarconf/wbarconf-0.7.2.2.ebuild,v 1.1 2012/05/14 17:37:18 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbarconf/wbarconf-0.7.2.2-r1.ebuild,v 1.1 2012/06/17 14:32:36 hasufell Exp $
 
 EAPI=4