Remove old version. Version bump.

(Portage version: 2.1.3.19)

5 files changed, 20 insertions, 32 deletions

diff --git a/dev-util/dialogblocks/ChangeLog b/dev-util/dialogblocks/ChangeLog
index 51635b9e1edb..a4ba2995075a 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.12 2007/12/04 14:24:21 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialogblocks/ChangeLog,v 1.13 2007/12/30 08:59:26 mrness Exp $
+
+*dialogblocks-4.21 (30 Dec 2007)
+
+  30 Dec 2007; Alin Năstac <mrness@gentoo.org> -files/dialogblocks.desktop,
+  -dialogblocks-4.17.ebuild, +dialogblocks-4.21.ebuild:
+  Remove old version. Version bump.
 
 *dialogblocks-4.20 (04 Dec 2007)
 
diff --git a/dev-util/dialogblocks/dialogblocks-4.17.ebuild b/dev-util/dialogblocks/dialogblocks-4.21.ebuild
index 33b2f9a747ca..fa5daaf607e3 100644
--- a/dev-util/dialogblocks/dialogblocks-4.17.ebuild
+++ b/dev-util/dialogblocks/dialogblocks-4.21.ebuild
@@ -1,21 +1,21 @@
 # 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.17.ebuild,v 1.1 2007/10/22 22:23:58 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialogblocks/dialogblocks-4.21.ebuild,v 1.1 2007/12/30 08:59:26 mrness Exp $
 
 inherit eutils
 
 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-gtk2-unicode.tar.gz )
-	amd64? ( http://www.anthemion.co.uk/${PN}/DialogBlocks-${PV}-i686-64bit.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"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=x11-libs/gtk+-2" # make sure gtk+ is installed before built_with_use test
-RDEPEND="${DEPEND}
+DEPEND=""
+RDEPEND=">=x11-libs/gtk+-2
 	>=media-libs/libpng-1.2
 	media-libs/jpeg
 	>=media-libs/tiff-3"
@@ -28,19 +28,9 @@ 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/dialogblocks.desktop b/dev-util/dialogblocks/files/dialogblocks.desktop
deleted file mode 100644
index bc832a6b74f5..000000000000
--- a/dev-util/dialogblocks/files/dialogblocks.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=DialogBlocks
-Comment=GUI builder tool for wxWidgets
-Icon=dialogblocks.xpm
-Exec=/usr/bin/dialogblocks
-Terminal=false
-Type=Application
-Categories=GNOME;Application;Development
diff --git a/dev-util/dialogblocks/files/digest-dialogblocks-4.17 b/dev-util/dialogblocks/files/digest-dialogblocks-4.17
deleted file mode 100644
index 169964e71f73..000000000000
--- a/dev-util/dialogblocks/files/digest-dialogblocks-4.17
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 daab61f00c02cc4a3242142d60bb40a6 DialogBlocks-4.17-i386-gtk2-unicode.tar.gz 9639253
-RMD160 b7a6b7ab0e4f3d2016428cf9f672d90cb7695026 DialogBlocks-4.17-i386-gtk2-unicode.tar.gz 9639253
-SHA256 fc136613f7ccd85ceb7ff04e2f400e3e9bbb61b455e9e5cca8302327129ab327 DialogBlocks-4.17-i386-gtk2-unicode.tar.gz 9639253
-MD5 60cd57f46d275944e41a9f3022ed88ae DialogBlocks-4.17-i686-64bit.tar.gz 9012745
-RMD160 9efed23819aa7a9cb19a8f05736eda4ddf62a639 DialogBlocks-4.17-i686-64bit.tar.gz 9012745
-SHA256 c3f5447875aa36c8c1b379da502b63cd710af34c7080ceacf9d63a0595a46c69 DialogBlocks-4.17-i686-64bit.tar.gz 9012745
diff --git a/dev-util/dialogblocks/files/digest-dialogblocks-4.21 b/dev-util/dialogblocks/files/digest-dialogblocks-4.21
new file mode 100644
index 000000000000..cea17158508a
--- /dev/null
+++ b/dev-util/dialogblocks/files/digest-dialogblocks-4.21
@@ -0,0 +1,6 @@
+MD5 8a7ccbbfc87b46aa68d066f5ec934708 DialogBlocks-4.21-i386.tar.gz 9493728
+RMD160 5b18177aa3092f3ef6eb39697486f5a76c420470 DialogBlocks-4.21-i386.tar.gz 9493728
+SHA256 9fc126009b09912369ce42db349481f489e7e7b8b012e1acba310728b7944288 DialogBlocks-4.21-i386.tar.gz 9493728
+MD5 59a2b3a1f9d40ad2de75e265f9cd2c1d DialogBlocks-4.21-i686.tar.gz 9764812
+RMD160 210d34ec3977153d6c90d4990dfe33ad7e060b2b DialogBlocks-4.21-i686.tar.gz 9764812
+SHA256 c6abae25018b40489f5e575880a1040d0864d881473807936edffe64bb4dec66 DialogBlocks-4.21-i686.tar.gz 9764812