Version bump.

(Portage version: 2.1.3.19)

4 files changed, 23 insertions, 21 deletions

diff --git a/dev-util/dialogblocks/ChangeLog b/dev-util/dialogblocks/ChangeLog
index 82d276b0a3d8..51635b9e1edb 100644
--- a/dev-util/dialogblocks/ChangeLog
+++ b/dev-util/dialogblocks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/dialogblocks
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dialogblocks/ChangeLog,v 1.11 2007/10/22 22:23:58 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialogblocks/ChangeLog,v 1.12 2007/12/04 14:24:21 mrness Exp $
+
+*dialogblocks-4.20 (04 Dec 2007)
+
+  04 Dec 2007; Alin Năstac <mrness@gentoo.org> -dialogblocks-4.15.ebuild,
+  +dialogblocks-4.20.ebuild:
+  Version bump.
 
 *dialogblocks-4.17 (22 Oct 2007)
 
diff --git a/dev-util/dialogblocks/dialogblocks-4.15.ebuild b/dev-util/dialogblocks/dialogblocks-4.20.ebuild
index e6c6188d382d..e8d78543ddd5 100644
--- a/dev-util/dialogblocks/dialogblocks-4.15.ebuild
+++ b/dev-util/dialogblocks/dialogblocks-4.20.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dialogblocks/dialogblocks-4.15.ebuild,v 1.1 2007/09/25 21:39:56 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialogblocks/dialogblocks-4.20.ebuild,v 1.1 2007/12/04 14:24:21 mrness Exp $
 
 inherit eutils
 
 DESCRIPTION="GUI builder tool for wxWidgets"
 HOMEPAGE="http://www.anthemion.co.uk/dialogblocks/"
-SRC_URI="http://www.anthemion.co.uk/${PN}/DialogBlocks-${PV}-i386-gtk2-unicode.tar.gz"
+SRC_URI="!amd64? ( http://www.anthemion.co.uk/${PN}/DialogBlocks-${PV}-i386.tar.gz )
+	amd64? ( http://www.anthemion.co.uk/${PN}/DialogBlocks-${PV}-i686.tar.gz )"
 
 SLOT="0"
 LICENSE="as-is"
@@ -17,34 +18,26 @@ DEPEND=">=x11-libs/gtk+-2" # make sure gtk+ is installed before built_with_use t
 RDEPEND="${DEPEND}
 	>=media-libs/libpng-1.2
 	media-libs/jpeg
-	>=media-libs/tiff-3
-	amd64? ( app-emulation/emul-linux-x86-gtklibs )"
+	>=media-libs/tiff-3"
 
 S="${WORKDIR}"
 
 RESTRICT="strip" # the dialogblocks program is already stripped
 
-pkg_setup() {
-	if use x86 && ! built_with_use ">=x11-libs/gtk+-2" xinerama ; then
-		echo
-		eerror "In order to emerge this package, you need to re-emerge"
-		eerror "x11-libs/gtk+ with xinerama USE flag enabled."
-		die "gtk+ must have xinerama USE flag enabled"
-	fi
-}
-
 src_install() {
 	dodir /opt/dialogblocks
 	tar -xzf DialogBlocksData.tar.gz -C "${D}/opt/dialogblocks" || die "failed to extract data from tarball"
 	fowners -R root:root /opt/dialogblocks
+	dosed 's:/usr/share/:/opt/:' /opt/dialogblocks/dialogblocks.desktop
 
 	dosym /opt/dialogblocks/dialogblocks32x32.xpm /usr/share/pixmaps/dialogblocks.xpm
-	insinto /usr/share/applications
-	doins "${FILESDIR}/dialogblocks.desktop"
+	dosym /opt/dialogblocks/dialogblocks.desktop /usr/share/applications/dialogblocks.desktop
 	newbin "${FILESDIR}/dialogblocks.sh" dialogblocks
 }
 
 pkg_postinst() {
-	# Fix incorrect owner of the directories, created by previous versions
-	chown -R root:root "${ROOT}"/opt/dialogblocks
+	if ! built_with_use ">=x11-libs/gtk+-2" xinerama ; then
+		eerror "In order to emerge this package, you need to re-emerge"
+		eerror "x11-libs/gtk+ with xinerama USE flag enabled."
+	fi
 }
diff --git a/dev-util/dialogblocks/files/digest-dialogblocks-4.15 b/dev-util/dialogblocks/files/digest-dialogblocks-4.15
deleted file mode 100644
index b7d50043b2ca..000000000000
--- a/dev-util/dialogblocks/files/digest-dialogblocks-4.15
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 117bfe1e4804eb1159e1bc430dba06ea DialogBlocks-4.15-i386-gtk2-unicode.tar.gz 9596550
-RMD160 07ac9015e00bdaee90eab76a24eac0d6dc592d7f DialogBlocks-4.15-i386-gtk2-unicode.tar.gz 9596550
-SHA256 811668edf8d419954737cd317234f5754962667fe3e3ef2ce0300171ba7d5327 DialogBlocks-4.15-i386-gtk2-unicode.tar.gz 9596550
diff --git a/dev-util/dialogblocks/files/digest-dialogblocks-4.20 b/dev-util/dialogblocks/files/digest-dialogblocks-4.20
new file mode 100644
index 000000000000..b236c1c374dd
--- /dev/null
+++ b/dev-util/dialogblocks/files/digest-dialogblocks-4.20
@@ -0,0 +1,6 @@
+MD5 f44ea5261cf28c501e7605be6a804734 DialogBlocks-4.20-i386.tar.gz 8768903
+RMD160 9f891fd2a55429ff4acf6d05e12f1aacdbf6cd56 DialogBlocks-4.20-i386.tar.gz 8768903
+SHA256 1534e4221b450b7614e6c2b302a6820e5a110b9c0b6b93b350b257213ea81724 DialogBlocks-4.20-i386.tar.gz 8768903
+MD5 a4ea3e69bd5be536fdd8b5c9fae7ec11 DialogBlocks-4.20-i686.tar.gz 9018704
+RMD160 bb8da54eca4bd54f4df6194f074f7212876b7f43 DialogBlocks-4.20-i686.tar.gz 9018704
+SHA256 eef3483755252c53d06ccaf789723f1a9df56aaff72d077433d922ece64ce182 DialogBlocks-4.20-i686.tar.gz 9018704