net-misc/sshmenu: Version bump, thanks to dilfridge

svn path=/sunrise/; revision=10137

5 files changed, 37 insertions, 46 deletions

diff --git a/net-misc/sshmenu/ChangeLog b/net-misc/sshmenu/ChangeLog
index ccf79267f..ec72346f2 100644
--- a/net-misc/sshmenu/ChangeLog
+++ b/net-misc/sshmenu/ChangeLog
@@ -3,6 +3,11 @@
 # $Header: $
 
   11 Feb 2010; Angelo D'Autilia (sYdRo) <sydro@salug.it>
+  -sshmenu-3.15.ebuild, -files/sshmenu-3.15-fixmultilib.patch,
+  +sshmenu-3.18.ebuild, +files/sshmenu-3.18-fixmultilib.patch:
+  Version bump, thanks to dilfridge
+
+  11 Feb 2010; Angelo D'Autilia (sYdRo) <sydro@salug.it>
   sshmenu-3.15.ebuild:
   Fix dep, net-misc/gtk2-ssh-askpass was removed, there isnt on tree
 
diff --git a/net-misc/sshmenu/Manifest b/net-misc/sshmenu/Manifest
index ba7f43f9e..96cb95762 100644
--- a/net-misc/sshmenu/Manifest
+++ b/net-misc/sshmenu/Manifest
@@ -1,5 +1,5 @@
-AUX sshmenu-3.15-fixmultilib.patch 361 RMD160 7626a37e5dc20d6458bc5047121c5a6ec8af67e9 SHA1 e35de978d2db43c3112f523c1ad3f86ec53fd807 SHA256 b895ccfc387eabbc659bd678f23a35c6358aa94502c1adee93d72a3e95ed567d
-DIST sshmenu-3.15.tar.gz 35399 RMD160 312ab8880a443adac6a628c1219600425bc0d12b SHA1 88383580440ebf626f62ee593709db6d556b8aac SHA256 70d714cdb33e89b8b4dafc830912f08d9d75a5edcbe5c320beab36b0692ae522
-EBUILD sshmenu-3.15.ebuild 941 RMD160 f22a270e2f2da410cfcee8a23b28c70035490baf SHA1 0712580ee59b2b6b4ab71052cb22fde2681bc94e SHA256 110de87f78400fa1f223c41d33802960f3460edf4f134cbd2093ea66a2a94e79
-MISC ChangeLog 1310 RMD160 450b7f66f393595f4b24a5510a67ca02b5e088dc SHA1 eccec811a0027de68cfa6b1dd02dd6a503e84aae SHA256 c23fe38faddd7d61182ed765a0e2a155b9340117d57b02c9540a7699a73c3cb4
+AUX sshmenu-3.18-fixmultilib.patch 361 RMD160 7626a37e5dc20d6458bc5047121c5a6ec8af67e9 SHA1 e35de978d2db43c3112f523c1ad3f86ec53fd807 SHA256 b895ccfc387eabbc659bd678f23a35c6358aa94502c1adee93d72a3e95ed567d
+DIST sshmenu-3.18.tar.gz 39747 RMD160 de20f49314b9d1b8d6181f3cdb1fff6885ef1533 SHA1 79b35e4977fc90282eeaa46c5734d982897483b5 SHA256 52d32b8fe92140c0a32c7cd8a79a32b4f5f1c6cac0b13bd1e465728b2b21233e
+EBUILD sshmenu-3.18.ebuild 685 RMD160 21faad736adb09593b2f9974e7b357752710318f SHA1 fde8deb89b49b4d38a7275c1c58436625a233d01 SHA256 2a67aedfbd64092d5156628559e071c60e3b15caeff9f7106004d9f6e016e0bc
+MISC ChangeLog 1530 RMD160 e0ca17da1de0691d7e2f37d9e27354c5bc187be9 SHA1 a567c9007dd171d4881b0ed93e47d649d8a0b4a5 SHA256 3547314fdfc26ecedba1de43a0638d0c0cf5e5796c3efb5bb3c2abca68ac99c2
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/net-misc/sshmenu/files/sshmenu-3.15-fixmultilib.patch b/net-misc/sshmenu/files/sshmenu-3.18-fixmultilib.patch
index 4cda95451..4cda95451 100644
--- a/net-misc/sshmenu/files/sshmenu-3.15-fixmultilib.patch
+++ b/net-misc/sshmenu/files/sshmenu-3.18-fixmultilib.patch
diff --git a/net-misc/sshmenu/sshmenu-3.15.ebuild b/net-misc/sshmenu/sshmenu-3.15.ebuild
deleted file mode 100644
index 7ede7ef3b..000000000
--- a/net-misc/sshmenu/sshmenu-3.15.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="1"
-## We need virtualx for src_test's Xmake stuff.
-inherit eutils multilib virtualx
-
-DESCRIPTION="A gnome applet interface to SSH."
-HOMEPAGE="http://sshmenu.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="gnome"
-
-RDEPEND="dev-lang/ruby:1.8
-	>=dev-ruby/ruby-gtk2-0.1.18
-	gnome? ( dev-ruby/ruby-gconf2
-		dev-ruby/ruby-panel-applet2 )
-	|| ( net-misc/x11-ssh-askpass )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-fixmultilib.patch
-}
-
-src_test() {
-	Xmake TEST || die "Tests failed!"
-}
-
-src_install() {
-	emake LIBDIR="$(get_libdir)" DESTDIR="${D}" install || die "Install failed!"
-
-	if ! use gnome; then
-		rm "${D}"/usr/$(get_libdir)/ruby/1.8/gnome-sshmenu.rb
-		rm "${D}"/usr/bin/sshmenu-gnome
-		rm -rf "${D}"/usr/share/icons
-	fi
-}
diff --git a/net-misc/sshmenu/sshmenu-3.18.ebuild b/net-misc/sshmenu/sshmenu-3.18.ebuild
new file mode 100644
index 000000000..261762b1d
--- /dev/null
+++ b/net-misc/sshmenu/sshmenu-3.18.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+USE_RUBY="ruby18 ruby19"
+
+inherit multilib ruby-ng
+
+DESCRIPTION="A gnome applet interface to SSH"
+HOMEPAGE="http://sshmenu.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="gnome"
+
+RUBY_PATCHES=( ${P}-fixmultilib.patch )
+
+RDEPEND="!gnome? ( net-misc/x11-ssh-askpass )"
+
+ruby_add_rdepend gnome "dev-ruby/ruby-gconf2 dev-ruby/ruby-panel-applet2"
+ruby_add_rdepend ">=dev-ruby/ruby-gtk2-0.19.3"
+
+all_ruby_install() {
+	emake LIBDIR="$(get_libdir)" DESTDIR="${D}" install || die "Install failed!"
+}