Both libjpeg.so.62 and libpng12.so.0 are required. Use QA_PRESTRIPPED and QA_DT_HASH instead of RESTRICT.

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

3 files changed, 25 insertions, 27 deletions

diff --git a/dev-util/dialogblocks/ChangeLog b/dev-util/dialogblocks/ChangeLog
index 20696d7dd54c..93e563702469 100644
--- a/dev-util/dialogblocks/ChangeLog
+++ b/dev-util/dialogblocks/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/dialogblocks
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dialogblocks/ChangeLog,v 1.19 2009/08/23 08:34:17 mrness Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialogblocks/ChangeLog,v 1.20 2010/03/08 21:57:29 ssuominen Exp $
+
+  08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  dialogblocks-4.33.ebuild:
+  Both libjpeg.so.62 and libpng12.so.0 are required. Use QA_PRESTRIPPED and
+  QA_DT_HASH instead of RESTRICT.
 
 *dialogblocks-4.33 (23 Aug 2009)
 
diff --git a/dev-util/dialogblocks/Manifest b/dev-util/dialogblocks/Manifest
index 6340eb266fc6..45ad0fac6a92 100644
--- a/dev-util/dialogblocks/Manifest
+++ b/dev-util/dialogblocks/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dialogblocks.sh 86 RMD160 e86c888b3933182b141d6156e9b74196f252aa03 SHA1 74154f1d44060b2cf5d4d1f8a8fd985d6429cae2 SHA256 42d2c7c3b6ea365311a41259277729cf4b2bb335a710b21c5343ef9754fecc1c
 DIST DialogBlocks-4.30-i386.tar.gz 9912096 RMD160 9185dfc367dd78fc685ed1f4805e9cf82d3071a9 SHA1 b0df54871f121dcd4e966dbda7bc8b0d40347ff8 SHA256 d5b8d499852b3a425a3587b33dab8342ae29d157b4e9b4733c3b300d18764ebe
 DIST DialogBlocks-4.30-x86_64.tar.gz 10263978 RMD160 6ced567f807cbd4b2d29f8f1cfa72fabfb62878f SHA1 5fe6ad0a6e9d9e4c0eea6d7af7e7af3201a6c336 SHA256 5dfd477720d0ac1a3473c851326200b7d447feaee5f5c975247801dbc64e7cae
 DIST DialogBlocks-4.33-i386.tar.gz 9950896 RMD160 97a00302c20d6cd919e2de918593372ea21ae393 SHA1 817a795d66d11abbe99dee74701d678e79eb617f SHA256 c7f6b48141159ac8cb6901ea204fd073f9a15f4cad85066bcd569a962abc21a1
 DIST DialogBlocks-4.33-x86_64.tar.gz 10296362 RMD160 d9483e62172110e5b72b89889855cf3b6638c3b5 SHA1 80e8fcc7e813c044a1e1848dd008cfe8a3f9a829 SHA256 8c12aac1fc3440916f4fd9a643f7d266cf5cbc3d8742aa20bd63c10b908eab3d
 EBUILD dialogblocks-4.30.ebuild 1428 RMD160 46e65e30372baadbbf9874d0e1704680112b7826 SHA1 62504c925e7001cd5e0fbc407aa46d922a39d964 SHA256 46f70c5aaecab78a88d0a89a94c47bb41f949820f2e0dea89cd445756db02649
-EBUILD dialogblocks-4.33.ebuild 1428 RMD160 6056b04fe2ae50d51743981c7e52fb3e7106dbf9 SHA1 6172172a79fb36fe6cc2186d64130e9c06199a2b SHA256 28c3aaedd6c25d0d10f9ac22a973d920b97e4c5c3813c4ad51f3b6bbab5607cd
-MISC ChangeLog 3541 RMD160 7c61fb9c40ca337b086687414205525ce750aec7 SHA1 b3b78513988b40248dc0bd876597117790a22e1f SHA256 66ca8bc71bc2cadfcd377d7fc1568168373740edcbe664128f65b7e405b9a3c1
+EBUILD dialogblocks-4.33.ebuild 1469 RMD160 9e83748332e46bd244d62c878a6ab612fe468dba SHA1 012160266e87f9d9c111877608c3c3ac25798636 SHA256 1f129bf2a39971d74949d81b775a29b84f574a6c47ec32ef99e5199b623427f3
+MISC ChangeLog 3737 RMD160 fd2890b98be14208ade27f7952cdc5d02f3cc99b SHA1 59f069f732559dfb38031423560e0c9315e42055 SHA256 d3d99be2f707514d17d734865712051cbea3f5a7dc7f448cfc04291cf8bd613f
 MISC metadata.xml 505 RMD160 f90ac70664a606a1349c5882ed08ff9ed0d2c6c2 SHA1 2094518d3883e07ad6d5e49a977edd56f7c2762d SHA256 a1eb4cca2819059f779cf93f87ac970fb363d77fd7af96887a8a6ad0003579e7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqQ/xUACgkQ9A5kJBGSrsvXQACcDpe1bYYrY4J3opdyuq20LuMc
-ZNEAoIaYOy0NYFEBMAsjPEFS5KwBH/bd
-=fYvM
------END PGP SIGNATURE-----
diff --git a/dev-util/dialogblocks/dialogblocks-4.33.ebuild b/dev-util/dialogblocks/dialogblocks-4.33.ebuild
index 957bbbe5078c..37769e548014 100644
--- a/dev-util/dialogblocks/dialogblocks-4.33.ebuild
+++ b/dev-util/dialogblocks/dialogblocks-4.33.ebuild
@@ -1,29 +1,32 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dialogblocks/dialogblocks-4.33.ebuild,v 1.1 2009/08/23 08:34:17 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialogblocks/dialogblocks-4.33.ebuild,v 1.2 2010/03/08 21:57:29 ssuominen Exp $
 
-inherit eutils
+EAPI=2
 
 DESCRIPTION="GUI builder tool for wxWidgets"
 HOMEPAGE="http://www.anthemion.co.uk/dialogblocks/"
-SRC_URI="!amd64? ( http://www.anthemion.co.uk/${PN}/DialogBlocks-${PV}-i386.tar.gz )
+SRC_URI="x86? ( http://www.anthemion.co.uk/${PN}/DialogBlocks-${PV}-i386.tar.gz )
 	amd64? ( http://www.anthemion.co.uk/${PN}/DialogBlocks-${PV}-x86_64.tar.gz )"
 
-SLOT="0"
 LICENSE="as-is"
-KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="app-arch/tar"
-RDEPEND=">=x11-libs/gtk+-2
+RDEPEND="x11-libs/gtk+:2
 	x11-libs/libXinerama
-	>=media-libs/libpng-1.2
-	media-libs/jpeg
-	>=media-libs/tiff-3"
+	x11-libs/libXxf86vm
+	x11-libs/libSM
+	=media-libs/libpng-1.2*
+	=media-libs/jpeg-6*
+	sys-libs/zlib
+	x11-libs/libX11"
 
-S="${WORKDIR}"
+QA_PRESTRIPPED="opt/dialogblocks/dialogblocks"
+QA_DT_HASH="opt/dialogblocks/dialogblocks"
 
-RESTRICT="strip" # the dialogblocks program is already stripped
+S=${WORKDIR}
 
 src_install() {
 	dodir /opt/dialogblocks