Remove old versions. Install symlinks to png icons.

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

4 files changed, 20 insertions, 48 deletions

diff --git a/dev-util/helpblocks/ChangeLog b/dev-util/helpblocks/ChangeLog
index 7392b74f3732..530c641ae55a 100644
--- a/dev-util/helpblocks/ChangeLog
+++ b/dev-util/helpblocks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/helpblocks
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/helpblocks/ChangeLog,v 1.8 2008/10/19 11:07:03 mrness Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/helpblocks/ChangeLog,v 1.9 2009/03/07 13:57:03 mrness Exp $
+
+*helpblocks-1.21-r1 (07 Mar 2009)
+
+  07 Mar 2009; Alin Năstac <mrness@gentoo.org> -helpblocks-1.20-r1.ebuild,
+  -helpblocks-1.21.ebuild, +helpblocks-1.21-r1.ebuild:
+  Remove old versions. Install symlinks to png icons.
 
 *helpblocks-1.21 (19 Oct 2008)
 
diff --git a/dev-util/helpblocks/Manifest b/dev-util/helpblocks/Manifest
index 87eceb5f1323..6da1167ec60f 100644
--- a/dev-util/helpblocks/Manifest
+++ b/dev-util/helpblocks/Manifest
@@ -3,18 +3,15 @@ Hash: SHA1
 
 AUX helpblocks.desktop 168 RMD160 e15def87028d34175fd6dd5112daa1b8c6130d3c SHA1 29b34b97779e4815718118b04016cba11b4b0b15 SHA256 97f418389970d3a274bf9027d911089d10f7eaf39eb080daa547e52de746eafe
 AUX helpblocks.sh 78 RMD160 b2aa891d7bc45d41e2a1e6023f55ac53028d56da SHA1 d28074d6c1c7c4df5d91b9554ab21258d1ae4cdb SHA256 2796c32ce1ee4089cabe02f37a4fa23911a4039c75d0615dbf9912e99cabe64c
-DIST HelpBlocks-1.20-i386.tar.gz 3981479 RMD160 8f5a5a98aeb50328d615c0e76d779af73b9db394 SHA1 e08ec27885149e07cc3f6b00637229bdb8ba3218 SHA256 f70954f398c3b21dd537b312ac91381cee3b188e3e58ab41a16223c046c79d96
-DIST HelpBlocks-1.20-i686.tar.gz 3576151 RMD160 b04fb99951665cf03ea9587ae662dc9c5736648c SHA1 e0fdbfed123df8f926296bc3907bfa6f6687f155 SHA256 7777872d15fb72e66ba384b7b9ed8b7acba5e6a4743b69dd938863869c093ab0
 DIST HelpBlocks-1.21-i386.tar.gz 3945543 RMD160 76dcb5aa6c78677cad4d20ebed476345c2e5bfdb SHA1 56344167786b8f12851a307d8b8c49bdf84b887d SHA256 a5ae1ac56c3c7d07b409621de8428b4bb72a262e6aec960d49c1b682b4e75f63
 DIST HelpBlocks-1.21-x86_64.tar.gz 3932880 RMD160 78e7be35fad200297de986727425d45fae276bbc SHA1 83e6d62ed32324c454857cfce73012baa0a8863d SHA256 1b5363843d6ac8df3643b556526b87fe7dd302a39b624ec8ad6229c9e41e70d1
-EBUILD helpblocks-1.20-r1.ebuild 1052 RMD160 5c24bcdb3a7181cbd53ace5ecce340a03e5a4e51 SHA1 6d5074dee857ccefc2b0e235c4a2738b9747d636 SHA256 d32c7b5484dc012607dff6fc5b9b2c0786821c970996488563e719d189b77b82
-EBUILD helpblocks-1.21.ebuild 1051 RMD160 ac63b32cedbdb50af5eaefed78dcbcc51dc75f4f SHA1 ec8ca166184a4d1268e4e0d36e18aaacf1db9072 SHA256 e78e82cfef881a525f6bd213889d2baf7d1210f029a234254b456de6ff50e180
-MISC ChangeLog 1384 RMD160 54a7e3c04371dd7f2ab0f4409358964940fd101d SHA1 b6281946415cc2437dddf4345c326693f20bac0e SHA256 fa92fe4342ea669d84238e473e460f40289219e6fd41ba50d8d3e719d79eb222
+EBUILD helpblocks-1.21-r1.ebuild 1136 RMD160 8c3540f59d71528cce3ed0c033e7db5f39d27a9a SHA1 568c13d3719b594ab2c45b3cbae9f7ab5ca701c9 SHA256 a49ebbb4c4220f725fc8230fb23847990fe3713207642f0f86f259f7e52fdb92
+MISC ChangeLog 1605 RMD160 36e6b93a8536836275dc5aa50e99e80ac6837eed SHA1 054c55dabf4ba8a9351a9edbb6a26b4c4accfcf3 SHA256 2efc4a54efb87ea69e60bba59a861c1a8872c2ffef8bf9b2320ffdfe925f0269
 MISC metadata.xml 464 RMD160 004eb63697ebd0267804cda942149ce7341da53c SHA1 37ffb24fc1a114dbcf9e55f2d32d0c905b724c31 SHA256 1a856fc56a58af7e1b03785e99eea6e59d9f4bc5be3f4dec824869c0b0e26e26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkj7FOAACgkQPrHvTlXvhtsiZwCdEFJDGHoLPNAPSK/T2CTJzJ3W
-t70AnjhWEeAfuacpWwJza4QI+kWxdv5L
-=ibXA
+iEYEARECAAYFAkmyfTUACgkQts85UDFmaOUq8QCfeAZQJHPzNmuilUYSFXKoHOgi
+s7MAn3d5tZGWk3Nk4eswEB7QCeBisZJU
+=9jxX
 -----END PGP SIGNATURE-----
diff --git a/dev-util/helpblocks/helpblocks-1.20-r1.ebuild b/dev-util/helpblocks/helpblocks-1.20-r1.ebuild
deleted file mode 100644
index 6f84e624049e..000000000000
--- a/dev-util/helpblocks/helpblocks-1.20-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/helpblocks/helpblocks-1.20-r1.ebuild,v 1.1 2008/02/13 14:53:06 mrness Exp $
-
-DESCRIPTION="HTML Help Editor for wxWidgets"
-HOMEPAGE="http://www.helpblocks.com/"
-SRC_URI="x86? ( http://www.helpblocks.com/HelpBlocks-${PV}-i386.tar.gz )
-	amd64? ( http://www.helpblocks.com/HelpBlocks-${PV}-i686.tar.gz )"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=x11-libs/gtk+-2
-	x11-libs/libXinerama
-	>=media-libs/libpng-1.2
-	media-libs/jpeg
-	>=media-libs/tiff-3"
-
-S="${WORKDIR}"
-
-RESTRICT="strip" # the helpblocks program is already stripped
-
-src_install() {
-	dodir /opt/helpblocks
-	tar -xzf HelpBlocksData.tar.gz -C "${D}/opt/helpblocks" || die "failed to extract data from tarball"
-
-	dosym /opt/helpblocks/helpblocks.xpm /usr/share/pixmaps/helpblocks.xpm
-	insinto /usr/share/applications
-	doins "${FILESDIR}/helpblocks.desktop"
-	newbin "${FILESDIR}/helpblocks.sh" helpblocks
-}
diff --git a/dev-util/helpblocks/helpblocks-1.21.ebuild b/dev-util/helpblocks/helpblocks-1.21-r1.ebuild
index 47d819beb0aa..b29cf003b458 100644
--- a/dev-util/helpblocks/helpblocks-1.21.ebuild
+++ b/dev-util/helpblocks/helpblocks-1.21-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/helpblocks/helpblocks-1.21.ebuild,v 1.1 2008/10/19 11:07:03 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/helpblocks/helpblocks-1.21-r1.ebuild,v 1.1 2009/03/07 13:57:03 mrness Exp $
 
 DESCRIPTION="HTML Help Editor for wxWidgets"
 HOMEPAGE="http://www.helpblocks.com/"
@@ -27,7 +27,10 @@ src_install() {
 	dodir /opt/helpblocks
 	tar -xzf HelpBlocksData.tar.gz -C "${D}/opt/helpblocks" || die "failed to extract data from tarball"
 
-	dosym /opt/helpblocks/helpblocks.xpm /usr/share/pixmaps/helpblocks.xpm
+	local i
+	for i in 32x32 48x48 128x128; do
+	    dosym /opt/helpblocks/appicons/helpblocks${i}.png /usr/share/icons/hicolor/${i}/apps/helpblocks.png
+	done
 	insinto /usr/share/applications
 	doins "${FILESDIR}/helpblocks.desktop"
 	newbin "${FILESDIR}/helpblocks.sh" helpblocks