www-misc/abloadtool: Switched to wrapper-script; nautilus-support added

svn path=/sunrise/; revision=12630

6 files changed, 35 insertions, 10 deletions

diff --git a/www-misc/abloadtool/ChangeLog b/www-misc/abloadtool/ChangeLog
index 86313469e..1b1328ebc 100644
--- a/www-misc/abloadtool/ChangeLog
+++ b/www-misc/abloadtool/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*abloadtool-3.0-r1 (06 Jan 2012)
+
+  06 Jan 2012; hasufell <julian.ospald@googlemail.com> -abloadtool-3.0.ebuild,
+  +abloadtool-3.0-r1.ebuild, +files/nautilus1.sh, +files/nautilus2.sh,
+  -files/abloadaction.desktop:
+  Switched to wrapper-script; nautilus-support added
+
 *abloadtool-3.0 (04 Jan 2012)
 
   04 Jan 2012; hasufell <julian.ospald@googlemail.com> +abloadtool-3.0.ebuild,
diff --git a/www-misc/abloadtool/Manifest b/www-misc/abloadtool/Manifest
index 3e0469edd..47aa58c52 100644
--- a/www-misc/abloadtool/Manifest
+++ b/www-misc/abloadtool/Manifest
@@ -1,6 +1,8 @@
-AUX abloadaction.desktop 340 RMD160 4000c5efa67639369aa62e7de258f0324a5bfeeb SHA1 bb45842863886bbddff8c26a2829437b5ade4ef3 SHA256 9394b6b77dd37cb0a112673214096a12869b0613a1a69f462817a4e57eb0b90a
+AUX abloadaction.desktop 342 RMD160 0ef21d7144dac350573d3bd5c461e9e3304b11a1 SHA1 ed786dfbcc1e7addd2453f89b728de7d1e083612 SHA256 a2c4e580991d34e23e679a908e297558127bea63033dd68662da67174e6792e7
+AUX nautilus1.sh 50 RMD160 98e759081f205b1c4b1a001503af9e9de6d84acb SHA1 f2996b4f4b611ed25c8500a85e24bdeb49c50e73 SHA256 854ee1a3bf203ec0ad0d3147fc3401d64146586d470d735228905390df24ea61
+AUX nautilus2.sh 37 RMD160 68a71a48cb3d7e95e8b90d9ec820a5f1a2eb6c19 SHA1 12aab4b10b8db563282e6c20e4a3a4a3b437543f SHA256 e2ad3b013ee23bff72385e2476febf6ef34ccc65884bc2de9776a910290199c2
 DIST abloadtool-3.0.i386.deb 608782 RMD160 4e5a1c557e89e1a0fccecf60baec715907eb6841 SHA1 72a606b6df967b147ae18e5b198bf282e9a1985d SHA256 380c07f612987ac3bfc2e81eb38d180ab5411e60d0e929688aff693d9eb2a177
 DIST abloadtool-3.0.x86_64.deb 397378 RMD160 f8aee17e0d0e0daf07992cc85ebe5e55b7ff5404 SHA1 ac87ffbdaf706ebd560ab1d3d7fa512be999f00b SHA256 f8d37b4481d8050949ecf147854d5df69cb70a01e57c9e0c50fa03adcc1a14cf
-EBUILD abloadtool-3.0.ebuild 1284 RMD160 428aa5d85a7bfec8e202f25a581a68c3210160f7 SHA1 d7d6a91e7bd1f42b7c381cfe8809591dee2e4141 SHA256 4171f2110d786ae6d192475e3cc90918e9f1f4c750cfcf860bb9e15e6ea44917
-MISC ChangeLog 305 RMD160 93ef81de98743b37b65c7b1c2ebdd50c8cc7d297 SHA1 313fc5d9f59d5ddf3ae135b62811aa76db32d4db SHA256 4d431e46285294c39ac9a6943f43ae10a19137e96ff8303238fb9d93a420122a
+EBUILD abloadtool-3.0-r1.ebuild 1753 RMD160 edc3a92faa3ca7fc030427cf334b8bc130d59d50 SHA1 6c774a1817b67f91399c7d1db7d5163f81eae8bc SHA256 beac25658c843aedbe062e28f87f58ffc804248c6868623d1b4ca7f44978d77d
+MISC ChangeLog 574 RMD160 8e2769d42339304950d1ad1e4028aa39dcb17d04 SHA1 fa7803b9467ef537f56347c78ed23ab7024ce635 SHA256 2292d10709a4dfad7a06901016cd7d4e04d8973e6a38f9fcb31ab23b620eca91
 MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82
diff --git a/www-misc/abloadtool/abloadtool-3.0.ebuild b/www-misc/abloadtool/abloadtool-3.0-r1.ebuild
index c624522d3..0f22fe2f5 100644
--- a/www-misc/abloadtool/abloadtool-3.0.ebuild
+++ b/www-misc/abloadtool/abloadtool-3.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="amd64? ( http://download.${PN}.de/ubuntu-64/${P}.x86_64.deb )
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="kde"
+IUSE="gnome kde"
 
 DEPEND=""
 RDEPEND="x11-libs/qt-core:4
@@ -44,15 +44,25 @@ src_install() {
 		doins "${FILESDIR}"/abloadaction.desktop
 	fi
 
-	cat > 91${PN} <<-END
-	LDPATH=/opt/${PN}/$(get_libdir)
-	END
+	if use gnome ; then
+		insinto /usr/share/${PN}
+		newins "${FILESDIR}"/nautilus1.sh "abload in background"
+		newins "${FILESDIR}"/nautilus2.sh "open in abload"
+	fi
 
-	doenvd 91${PN}
+	make_wrapper ${PN} /opt/${PN}/bin/${PN} "" /opt/${PN}/$(get_libdir)
 }
 
 pkg_postinst() {
 	fdo-mime_desktop_database_update
+
+	if use gnome ; then
+		elog "                                              "
+		elog "Nautilus scripts are in /usr/share/abloadtool."
+		elog "Copy them to ~/.gnome2/nautilus-scripts and   "
+		elog "make them executable!                         "
+		elog "                                              "
+	fi
 }
 
 pkg_postrm() {
diff --git a/www-misc/abloadtool/files/abloadaction.desktop b/www-misc/abloadtool/files/abloadaction.desktop
index 3e0b183ba..4ca5bda83 100644
--- a/www-misc/abloadtool/files/abloadaction.desktop
+++ b/www-misc/abloadtool/files/abloadaction.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]

 Type=Service

 ServiceTypes=KonqPopupMenu/Plugin,image/*

-MimeType=image/*

-Actions=uploadBackground;upload

+Actions=uploadBackground;upload;

+MimeType=image/*;

 

 [Desktop Action uploadBackground]

 Name=upload in background

diff --git a/www-misc/abloadtool/files/nautilus1.sh b/www-misc/abloadtool/files/nautilus1.sh
new file mode 100755
index 000000000..d0230c0d0
--- /dev/null
+++ b/www-misc/abloadtool/files/nautilus1.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+abloadtool --background --files "$@"
diff --git a/www-misc/abloadtool/files/nautilus2.sh b/www-misc/abloadtool/files/nautilus2.sh
new file mode 100755
index 000000000..c4f84bab9
--- /dev/null
+++ b/www-misc/abloadtool/files/nautilus2.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+abloadtool --files "$@"