9 files changed, 63 insertions, 100 deletions
diff --git a/app-cdr/isomaster/ChangeLog b/app-cdr/isomaster/ChangeLog
index a40c04f0d7b1..56f056558b56 100644
--- a/app-cdr/isomaster/ChangeLog
+++ b/app-cdr/isomaster/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/isomaster
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/ChangeLog,v 1.6 2007/05/19 16:41:16 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/ChangeLog,v 1.7 2007/07/20 13:09:21 pylon Exp $
+
+*isomaster-1.0 (20 Jul 2007)
+
+  20 Jul 2007; Lars Weiler <pylon@gentoo.org> -isomaster-0.7.ebuild,
+  -isomaster-0.7-r1.ebuild, isomaster-0.8.1.ebuild, +isomaster-1.0.ebuild:
+  Version bump, bug #181542; cleanup; desktop-entry fix, bug #179871.
 
   19 May 2007; Peter Weller <welp@gentoo.org> isomaster-0.8.1.ebuild:
   Keyworded ~x86-fbsd
diff --git a/app-cdr/isomaster/Manifest b/app-cdr/isomaster/Manifest
index 38c796b9d680..f247d0a4a36c 100644
--- a/app-cdr/isomaster/Manifest
+++ b/app-cdr/isomaster/Manifest
@@ -1,31 +1,34 @@
-DIST isomaster-0.7.tar.bz2 161558 RMD160 693f19986a96b73de265655e0bb1743192239746 SHA1 e26ec04c044af41143ad0864ff4a4a88d18c6a97 SHA256 f72472173be1c69ce74249a956fe7cad80ce0563a97dd0cbc1fa098a24c851d7
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST isomaster-0.8.1.tar.bz2 205535 RMD160 12d79078db9ecf0c00f0a8fdba6fd73f17dcbbbc SHA1 c3ffe0a351e09e404a5ad7ae69b1d4272b7d6e73 SHA256 19647b3b9bf798b82793b81aad22e5824ec13418a5fb429bdd8c70f67a9a9e21
-EBUILD isomaster-0.7-r1.ebuild 929 RMD160 7b043f56f7fd175960e1949ea476c2d588d8145c SHA1 0733115e166826737b2714e5435fc1a5cdc4935f SHA256 cb8e6a1f564ce496ca81daf57dc386b45812626d352c821b9ddc68645357a961
-MD5 bf81253d9c8eada685674fd757d3b1c7 isomaster-0.7-r1.ebuild 929
-RMD160 7b043f56f7fd175960e1949ea476c2d588d8145c isomaster-0.7-r1.ebuild 929
-SHA256 cb8e6a1f564ce496ca81daf57dc386b45812626d352c821b9ddc68645357a961 isomaster-0.7-r1.ebuild 929
-EBUILD isomaster-0.7.ebuild 905 RMD160 9e8252b5bcaff9ba3ddbd23533e535daa6290db6 SHA1 68b9627e8b05558a4869dd04989afb72237301a7 SHA256 6d75c8dc960bc804d544d6da4191445580b9a43d93f8855fabe243bcf0ea291b
-MD5 4c6882edf36b1db779182e83c08b360d isomaster-0.7.ebuild 905
-RMD160 9e8252b5bcaff9ba3ddbd23533e535daa6290db6 isomaster-0.7.ebuild 905
-SHA256 6d75c8dc960bc804d544d6da4191445580b9a43d93f8855fabe243bcf0ea291b isomaster-0.7.ebuild 905
-EBUILD isomaster-0.8.1.ebuild 788 RMD160 b1b984fb11d5c9c2dfe2a23e7c04b53a6b8b1bdb SHA1 90d8104cf9e1962b074bda4739842778697fd34f SHA256 3275e5ac7c866af0c65340a5004b2d429716dff521edfaf89120063bba924c58
-MD5 901383844eb8556b7614fa8a4a5f2305 isomaster-0.8.1.ebuild 788
-RMD160 b1b984fb11d5c9c2dfe2a23e7c04b53a6b8b1bdb isomaster-0.8.1.ebuild 788
-SHA256 3275e5ac7c866af0c65340a5004b2d429716dff521edfaf89120063bba924c58 isomaster-0.8.1.ebuild 788
-MISC ChangeLog 1052 RMD160 c5244ee54c201cae10de5e045f79f5c219fa0230 SHA1 be9478b330e9293f726f883175a2c7d679c18492 SHA256 38c5361e77cf74f83f9b83a28f804c77aa8141a3174d5fbf837e09bfc4d172e5
-MD5 4af7b14c4256858d76ef06ff860f63cf ChangeLog 1052
-RMD160 c5244ee54c201cae10de5e045f79f5c219fa0230 ChangeLog 1052
-SHA256 38c5361e77cf74f83f9b83a28f804c77aa8141a3174d5fbf837e09bfc4d172e5 ChangeLog 1052
+DIST isomaster-1.0.tar.bz2 149982 RMD160 6699ef4521294324f8682edb8773e70f57598392 SHA1 aefa48d235eabba60a725b6198bae2347dc07f8b SHA256 7033d6fc5c4674c62c3eeaaa5eb4f9809e7ad6841814802323f23da5d2e251e1
+EBUILD isomaster-0.8.1.ebuild 685 RMD160 b5a695f3c942ed9bc3986c11e68fea2357142b0d SHA1 8c0cbb08661a41e38d0bc905a4d40fddff649d98 SHA256 d3a4e3a02d03667ada67e0df466cc911a565f96727edf2c378c3f8c936cda30a
+MD5 8008eed8304898cc07a9e44c58f34461 isomaster-0.8.1.ebuild 685
+RMD160 b5a695f3c942ed9bc3986c11e68fea2357142b0d isomaster-0.8.1.ebuild 685
+SHA256 d3a4e3a02d03667ada67e0df466cc911a565f96727edf2c378c3f8c936cda30a isomaster-0.8.1.ebuild 685
+EBUILD isomaster-1.0.ebuild 706 RMD160 58f6d97040bbb3b26e6742cc7947f576bb6832d2 SHA1 ef611595761a1a2cf336862857a5c44d67f53f37 SHA256 e7387264290867698fb583cc8aa6e50ab4f893192b5d94867e1a72f4fa0b1d48
+MD5 b4a618b2e0fa238fe9ee300a725b24ac isomaster-1.0.ebuild 706
+RMD160 58f6d97040bbb3b26e6742cc7947f576bb6832d2 isomaster-1.0.ebuild 706
+SHA256 e7387264290867698fb583cc8aa6e50ab4f893192b5d94867e1a72f4fa0b1d48 isomaster-1.0.ebuild 706
+MISC ChangeLog 1298 RMD160 cca3d83a5939512f96de9cea028c68b7a8f19a6e SHA1 c08069941f301d294f6ca89959979ea1a07d659a SHA256 10921d3f52c80ae4a2ceb3f30b29186148f523444fa85c94ba4537438537bfb4
+MD5 6f1394d5d55263be813e239f975bfcb3 ChangeLog 1298
+RMD160 cca3d83a5939512f96de9cea028c68b7a8f19a6e ChangeLog 1298
+SHA256 10921d3f52c80ae4a2ceb3f30b29186148f523444fa85c94ba4537438537bfb4 ChangeLog 1298
 MISC metadata.xml 166 RMD160 02ca0a5d9279c1b52c3887f5a1f52f3feb002af9 SHA1 b9fccc7c24aa717c30efef068fd544a692f264f6 SHA256 ce62d1e5b04e01d03a732ee6d33b3d500810de8e55af4a527c970e5b475735d8
 MD5 d0eb51fbe8e05b6ee3ff2486ce2197a8 metadata.xml 166
 RMD160 02ca0a5d9279c1b52c3887f5a1f52f3feb002af9 metadata.xml 166
 SHA256 ce62d1e5b04e01d03a732ee6d33b3d500810de8e55af4a527c970e5b475735d8 metadata.xml 166
-MD5 4fc77f776e011577eb054078087dfa88 files/digest-isomaster-0.7 244
-RMD160 2f1220f8111d260a0edc1555a9b84203c3ce892d files/digest-isomaster-0.7 244
-SHA256 ac8b20a4b381a45492278df9e1c1f1bd91644936b48f3a50c4ab4af5241ee40b files/digest-isomaster-0.7 244
-MD5 4fc77f776e011577eb054078087dfa88 files/digest-isomaster-0.7-r1 244
-RMD160 2f1220f8111d260a0edc1555a9b84203c3ce892d files/digest-isomaster-0.7-r1 244
-SHA256 ac8b20a4b381a45492278df9e1c1f1bd91644936b48f3a50c4ab4af5241ee40b files/digest-isomaster-0.7-r1 244
 MD5 1306d1ba45e5902bace34f90b588daa0 files/digest-isomaster-0.8.1 250
 RMD160 de20fa9a2f3ecc2f1df427e8ad765603c3834b24 files/digest-isomaster-0.8.1 250
 SHA256 885bf77767c69000d54138ed360a3eef09c1fe3aae1db8074b8cec8ee9871584 files/digest-isomaster-0.8.1 250
+MD5 8de3c48d1dfc4ee8cc08ea406b240f60 files/digest-isomaster-1.0 244
+RMD160 23b7cbce3cdffbbb8469307c32e304a88f070425 files/digest-isomaster-1.0 244
+SHA256 04d3c5d98017a9a3f81ac05eb5bbf8c417c15ff753f8adddca53afdaae212c59 files/digest-isomaster-1.0 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGoLQC6IPkARlRZfQRAuMFAKCbF6GN3dU7bIPjJIvd47sav/vEcQCfWncj
+xTDeJwQVTarWWLHYSwRHDYE=
+=/jPm
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/isomaster/files/digest-isomaster-0.7 b/app-cdr/isomaster/files/digest-isomaster-0.7
deleted file mode 100644
index b12be6eab8fd..000000000000
--- a/app-cdr/isomaster/files/digest-isomaster-0.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ecc0a033211bb61c18a0bdde5612f2c9 isomaster-0.7.tar.bz2 161558
-RMD160 693f19986a96b73de265655e0bb1743192239746 isomaster-0.7.tar.bz2 161558
-SHA256 f72472173be1c69ce74249a956fe7cad80ce0563a97dd0cbc1fa098a24c851d7 isomaster-0.7.tar.bz2 161558
diff --git a/app-cdr/isomaster/files/digest-isomaster-0.7-r1 b/app-cdr/isomaster/files/digest-isomaster-0.7-r1
deleted file mode 100644
index b12be6eab8fd..000000000000
--- a/app-cdr/isomaster/files/digest-isomaster-0.7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ecc0a033211bb61c18a0bdde5612f2c9 isomaster-0.7.tar.bz2 161558
-RMD160 693f19986a96b73de265655e0bb1743192239746 isomaster-0.7.tar.bz2 161558
-SHA256 f72472173be1c69ce74249a956fe7cad80ce0563a97dd0cbc1fa098a24c851d7 isomaster-0.7.tar.bz2 161558
diff --git a/app-cdr/isomaster/files/digest-isomaster-1.0 b/app-cdr/isomaster/files/digest-isomaster-1.0
new file mode 100644
index 000000000000..250ee19527c2
--- /dev/null
+++ b/app-cdr/isomaster/files/digest-isomaster-1.0
@@ -0,0 +1,3 @@
+MD5 6bbb781a1b73499d3c0c6d961521cd9d isomaster-1.0.tar.bz2 149982
+RMD160 6699ef4521294324f8682edb8773e70f57598392 isomaster-1.0.tar.bz2 149982
+SHA256 7033d6fc5c4674c62c3eeaaa5eb4f9809e7ad6841814802323f23da5d2e251e1 isomaster-1.0.tar.bz2 149982
diff --git a/app-cdr/isomaster/isomaster-0.7-r1.ebuild b/app-cdr/isomaster/isomaster-0.7-r1.ebuild
deleted file mode 100644
index 5a448fe0528d..000000000000
--- a/app-cdr/isomaster/isomaster-0.7-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/isomaster-0.7-r1.ebuild,v 1.3 2007/07/13 05:40:32 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="GTK2 (bootable) CD ISO Image editor."
-HOMEPAGE="http://littlesvr.ca/isomaster/"
-SRC_URI="http://littlesvr.ca/isomaster/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.0"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	# make flags useful
-	sed -i -e "s:-Wall:${CFLAGS}:" Makefile || die "sed failed"
-	sed -i -e "s:-Wall:${CFLAGS}:" */Makefile || die "sed failed"
-
-	emake PREFIX="/usr" -j1 || die "emake failed"
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install || die "Install failed"
-	dodoc *.TXT bk/TODO.TXT
-
-	doicon icons/${PN}.png
-	make_desktop_entry ${PN} "Isomaster" ${PN}.png "Application;AudioVideo;"
-}
diff --git a/app-cdr/isomaster/isomaster-0.7.ebuild b/app-cdr/isomaster/isomaster-0.7.ebuild
deleted file mode 100644
index f9212e06e8c5..000000000000
--- a/app-cdr/isomaster/isomaster-0.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/isomaster-0.7.ebuild,v 1.3 2007/07/13 05:40:32 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="GTK2 (bootable) CD ISO Image editor."
-HOMEPAGE="http://littlesvr.ca/isomaster/"
-SRC_URI="http://littlesvr.ca/isomaster/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.0"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	# make flags useful
-	sed -i -e "s:-Wall:${CFLAGS}:" Makefile || die "sed failed"
-	sed -i -e "s:-Wall:${CFLAGS}:" */Makefile || die "sed failed"
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install || die "Install failed"
-	dodoc *.TXT bk/TODO.TXT
-
-	doicon icons/${PN}.png
-	make_desktop_entry ${PN} "Isomaster" ${PN}.png "Application;AudioVideo;"
-}
diff --git a/app-cdr/isomaster/isomaster-0.8.1.ebuild b/app-cdr/isomaster/isomaster-0.8.1.ebuild
index bd56b5b69386..ab1eae2582bd 100644
--- a/app-cdr/isomaster/isomaster-0.8.1.ebuild
+++ b/app-cdr/isomaster/isomaster-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/isomaster-0.8.1.ebuild,v 1.3 2007/07/13 05:40:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/isomaster-0.8.1.ebuild,v 1.4 2007/07/20 13:09:21 pylon Exp $
 
 inherit eutils
 
@@ -23,7 +23,4 @@ src_compile() {
 src_install() {
 	emake PREFIX="/usr" DESTDIR="${D}" install || die "Install failed"
 	dodoc *.TXT bk/TODO.TXT
-
-	doicon icons/${PN}.png
-	make_desktop_entry ${PN} "Isomaster" ${PN}.png "Application;AudioVideo;"
 }
diff --git a/app-cdr/isomaster/isomaster-1.0.ebuild b/app-cdr/isomaster/isomaster-1.0.ebuild
new file mode 100644
index 000000000000..c0aee5c17b3e
--- /dev/null
+++ b/app-cdr/isomaster/isomaster-1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/isomaster-1.0.ebuild,v 1.1 2007/07/20 13:09:21 pylon Exp $
+
+inherit eutils
+
+DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images"
+HOMEPAGE="http://littlesvr.ca/isomaster/"
+SRC_URI="http://littlesvr.ca/isomaster/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.0"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	emake PREFIX="/usr" || die "emake failed"
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install || die "Install failed"
+	dodoc *.TXT
+}