Version bump.

Package-Manager: portage-2.1.3.19

5 files changed, 39 insertions, 36 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/Manifest b/dev-util/dialogblocks/Manifest
index b8df2eb41162..5a99ff3f327f 100644
--- a/dev-util/dialogblocks/Manifest
+++ b/dev-util/dialogblocks/Manifest
@@ -9,35 +9,36 @@ AUX dialogblocks.sh 86 RMD160 e86c888b3933182b141d6156e9b74196f252aa03 SHA1 7415
 MD5 01a724adb96e891dfedbb0a86b20ce37 files/dialogblocks.sh 86
 RMD160 e86c888b3933182b141d6156e9b74196f252aa03 files/dialogblocks.sh 86
 SHA256 42d2c7c3b6ea365311a41259277729cf4b2bb335a710b21c5343ef9754fecc1c files/dialogblocks.sh 86
-DIST DialogBlocks-4.15-i386-gtk2-unicode.tar.gz 9596550 RMD160 07ac9015e00bdaee90eab76a24eac0d6dc592d7f SHA1 994a220c494a0b6968a52f57dea2bb7bdb54d053 SHA256 811668edf8d419954737cd317234f5754962667fe3e3ef2ce0300171ba7d5327
 DIST DialogBlocks-4.17-i386-gtk2-unicode.tar.gz 9639253 RMD160 b7a6b7ab0e4f3d2016428cf9f672d90cb7695026 SHA1 07add78627328f61df0e9dfc065daed10deea138 SHA256 fc136613f7ccd85ceb7ff04e2f400e3e9bbb61b455e9e5cca8302327129ab327
 DIST DialogBlocks-4.17-i686-64bit.tar.gz 9012745 RMD160 9efed23819aa7a9cb19a8f05736eda4ddf62a639 SHA1 f58408a70cb3bf198f508ce650101d9f4e5f0f70 SHA256 c3f5447875aa36c8c1b379da502b63cd710af34c7080ceacf9d63a0595a46c69
-EBUILD dialogblocks-4.15.ebuild 1594 RMD160 a0cc266568624f38b8a21f3cb8d4185fba7c35ce SHA1 923b39a09ef6b61d7a90caac1cfb6b819ec582fd SHA256 a8afc5667ba09a280eb112a093a5062cba562a7e5c6e00414fcfcc905d7136e5
-MD5 3c76c165a609ac6065fcab11ad07afd2 dialogblocks-4.15.ebuild 1594
-RMD160 a0cc266568624f38b8a21f3cb8d4185fba7c35ce dialogblocks-4.15.ebuild 1594
-SHA256 a8afc5667ba09a280eb112a093a5062cba562a7e5c6e00414fcfcc905d7136e5 dialogblocks-4.15.ebuild 1594
+DIST DialogBlocks-4.20-i386.tar.gz 8768903 RMD160 9f891fd2a55429ff4acf6d05e12f1aacdbf6cd56 SHA1 9d0603cff4e1c64febdfe48ac94fa215bdaf0539 SHA256 1534e4221b450b7614e6c2b302a6820e5a110b9c0b6b93b350b257213ea81724
+DIST DialogBlocks-4.20-i686.tar.gz 9018704 RMD160 bb8da54eca4bd54f4df6194f074f7212876b7f43 SHA1 2a943ae2c10483c36306f977555a12e5e751a8a2 SHA256 eef3483755252c53d06ccaf789723f1a9df56aaff72d077433d922ece64ce182
 EBUILD dialogblocks-4.17.ebuild 1556 RMD160 5e6fa066ac5b0c853b6ed460dd9225ead8e6080d SHA1 7e86c5008537e77f0e284364f5a020390924c425 SHA256 03c734c9f74a491d1d82f7b23697e517a64119c1cf08290975a1ab69debe73a7
 MD5 da6032b8b0860b0eb8b41b6fa1305c17 dialogblocks-4.17.ebuild 1556
 RMD160 5e6fa066ac5b0c853b6ed460dd9225ead8e6080d dialogblocks-4.17.ebuild 1556
 SHA256 03c734c9f74a491d1d82f7b23697e517a64119c1cf08290975a1ab69debe73a7 dialogblocks-4.17.ebuild 1556
-MISC ChangeLog 2214 RMD160 8826cacb9fac0dff349a3d75f2426efbd19a8f41 SHA1 4b3e04bc60cbb8370dd5af5646180acc0440bf84 SHA256 25e4b18d03169e71d487077bb33b601df974c540589cc0beaf0e2df173b98446
-MD5 e4815b922fd002c18da7de8c44070850 ChangeLog 2214
-RMD160 8826cacb9fac0dff349a3d75f2426efbd19a8f41 ChangeLog 2214
-SHA256 25e4b18d03169e71d487077bb33b601df974c540589cc0beaf0e2df173b98446 ChangeLog 2214
+EBUILD dialogblocks-4.20.ebuild 1502 RMD160 8f9483f757dbe4fafba53d10eb761b84e5d69e08 SHA1 1d3e510394d5f92736c841bb62f185fa612474bb SHA256 6787be63f3798ead594145e4c5b17cab7359bc68b868162afcc00802600a1155
+MD5 1b5af241aef7f0a1426fe28274766650 dialogblocks-4.20.ebuild 1502
+RMD160 8f9483f757dbe4fafba53d10eb761b84e5d69e08 dialogblocks-4.20.ebuild 1502
+SHA256 6787be63f3798ead594145e4c5b17cab7359bc68b868162afcc00802600a1155 dialogblocks-4.20.ebuild 1502
+MISC ChangeLog 2369 RMD160 ff1ee1e29bdfe67624eda5a604b90e81354ebb3a SHA1 2ea5bf39edd302fa832e54a9660c2c8588e5635d SHA256 1c982486502655935e413fef04e45843f42b1781b255c06f4484d2cdf0816a65
+MD5 39f9195e1124f4d986a605de6624d3e4 ChangeLog 2369
+RMD160 ff1ee1e29bdfe67624eda5a604b90e81354ebb3a ChangeLog 2369
+SHA256 1c982486502655935e413fef04e45843f42b1781b255c06f4484d2cdf0816a65 ChangeLog 2369
 MISC metadata.xml 505 RMD160 f90ac70664a606a1349c5882ed08ff9ed0d2c6c2 SHA1 2094518d3883e07ad6d5e49a977edd56f7c2762d SHA256 a1eb4cca2819059f779cf93f87ac970fb363d77fd7af96887a8a6ad0003579e7
 MD5 bf485cb78e5683b4a4a4cc16e08f982a metadata.xml 505
 RMD160 f90ac70664a606a1349c5882ed08ff9ed0d2c6c2 metadata.xml 505
 SHA256 a1eb4cca2819059f779cf93f87ac970fb363d77fd7af96887a8a6ad0003579e7 metadata.xml 505
-MD5 628129f85561fbfdffae0c759c7642a2 files/digest-dialogblocks-4.15 310
-RMD160 29245982a4d1c58b74afd200152c73e44bc54d70 files/digest-dialogblocks-4.15 310
-SHA256 9dd463ca34a9774180a6bed225e829ca992c4d5ecd3d4c1f2c8ac08cfc6416e3 files/digest-dialogblocks-4.15 310
 MD5 848d05ca48fe4ff6fd7805dd4f0ec04c files/digest-dialogblocks-4.17 599
 RMD160 49951acba68ef2b04bee70585c2e33ff4420e474 files/digest-dialogblocks-4.17 599
 SHA256 67edd773ff3bf27115135f630c27e9bff5e9faee3c370570d02100bf6ca95639 files/digest-dialogblocks-4.17 599
+MD5 128c6a2466b5ffabda0ed0f4008f2ae2 files/digest-dialogblocks-4.20 542
+RMD160 67b3f06ca6d09d569612a5ab55e510cb63c49891 files/digest-dialogblocks-4.20 542
+SHA256 aedf0abe5aefb94d8d6208c64bb533182b38627244e6ae15897d9cddf945fa35 files/digest-dialogblocks-4.20 542
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHHSMKVSA5X31g7/gRAvW6AJ9EFqV4OmHXqwkdYzRH4WrqtsDxQgCfW1Sq
-W2LFpf/7qGdq6r+RdaCE3VI=
-=Q+2z
+iD8DBQFHVWMhVSA5X31g7/gRAnnBAKCgM4L94BhK3a/D7wnIO68Zkvjv9QCfbSCs
+0TCYKs1AgnDMAcMb3l4CcKs=
+=4N98
 -----END PGP SIGNATURE-----
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