summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-misc/putty/ChangeLog6
-rw-r--r--net-misc/putty/putty-0.62.20120823-r1.ebuild18
2 files changed, 11 insertions, 13 deletions
diff --git a/net-misc/putty/ChangeLog b/net-misc/putty/ChangeLog
index 1e1aa9104492..f2ad0ac6ee2d 100644
--- a/net-misc/putty/ChangeLog
+++ b/net-misc/putty/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/putty
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/putty/ChangeLog,v 1.72 2013/06/28 14:22:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/putty/ChangeLog,v 1.73 2013/06/29 15:01:21 jer Exp $
+
+ 29 Jun 2013; Jeroen Roovers <jer@gentoo.org> putty-0.62.20120823-r1.ebuild:
+ Package new icons separately (bug #473022).
*putty-0.62.20120823-r1 (28 Jun 2013)
@@ -279,4 +282,3 @@
03 Jun 2003; Tavis Ormandy <taviso@gentoo.org> putty-20030603.ebuild:
Initial import, gtk+ port of windows ssh client.
-
diff --git a/net-misc/putty/putty-0.62.20120823-r1.ebuild b/net-misc/putty/putty-0.62.20120823-r1.ebuild
index 50e770bbcc51..e1c1c7fcccf4 100644
--- a/net-misc/putty/putty-0.62.20120823-r1.ebuild
+++ b/net-misc/putty/putty-0.62.20120823-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/putty/putty-0.62.20120823-r1.ebuild,v 1.1 2013/06/28 14:22:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/putty/putty-0.62.20120823-r1.ebuild,v 1.2 2013/06/29 15:01:21 jer Exp $
EAPI="4"
@@ -9,7 +9,9 @@ inherit autotools eutils gnome2-utils toolchain-funcs versionator
MY_PV="$(get_version_component_range 1-2)-2012-08-23"
DESCRIPTION="UNIX port of the famous Telnet and SSH client"
HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
-SRC_URI="http://tartarus.org/~simon/${PN}-snapshots/${PN}-${MY_PV}.tar.gz"
+SRC_URI="
+ http://tartarus.org/~simon/${PN}-snapshots/${PN}-${MY_PV}.tar.gz
+ http://dev.gentoo.org/~jer/${PN}-icons.tar.bz2"
LICENSE="MIT"
SLOT="0"
@@ -50,11 +52,6 @@ src_configure() {
src_compile() {
cd "${S}"/unix || die
emake $(usex ipv6 '' COMPAT=-DNO_IPV6)
-
- cd "${S}"/icons || die
- for i in 16 22 24 32 48 64 128 256; do
- ./mkicon.py putty_icon ${i} putty-${i}.png || die
- done
}
src_install() {
@@ -66,13 +63,12 @@ src_install() {
cd "${S}"/unix || die
default
- # install desktop file provided by Gustav Schaffter in #49577
- cd "${S}"/icons || die
for i in 16 22 24 32 48 64 128 256; do
- newicon -s ${i} putty-${i}.png putty.png
+ newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
done
- make_desktop_entry putty PuTTY putty Network
+ # install desktop file provided by Gustav Schaffter in #49577
+ make_desktop_entry ${PN} PuTTY ${PN} Network
}
pkg_preinst() {