media-gfx/mapivi: remove version that looks newer but is in fact older, fix wrong usage

svn path=/sunrise/; revision=2113

5 files changed, 21 insertions, 59 deletions

diff --git a/media-gfx/mapivi/ChangeLog b/media-gfx/mapivi/ChangeLog
index caabb4f9f..2d4c568f7 100644
--- a/media-gfx/mapivi/ChangeLog
+++ b/media-gfx/mapivi/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Dec 2006; Stefan Schweizer <genstef@gentoo.org> mapivi-0.9.1.ebuild,
+  -mapivi-8.1.0.ebuild:
+  remove version that looks newer but is in fact older, fix wrong  usage
+
   22 Nov 2006; Christian Berendt (lhunephel) <christian@suppentopf.net>
   mapivi-0.9.1.ebuild:
   removed the ppc keyword.
diff --git a/media-gfx/mapivi/Manifest b/media-gfx/mapivi/Manifest
index 041f64034..47654d164 100644
--- a/media-gfx/mapivi/Manifest
+++ b/media-gfx/mapivi/Manifest
@@ -1,17 +1,12 @@
-DIST mapivi081.tar.bz2 199167 RMD160 71cb179a8abe69b6b5e1767f60d66df4ee7591fa SHA1 0777ad101dcc5813d5945035c8629011878251ce SHA256 1ac70fb23dbcec14dd930af1ae3d10e078620d2db9cd5ae32ae1a8e75760e941
 DIST mapivi091.tgz 359537 RMD160 508172514862496b995080d7e5605c1d8e3f0dab SHA1 53d285cd43fd8418caabc298275a047308a81643 SHA256 5655090fb4acb35031f18806b043232e9e564ff174865dc34f5b9104cb1152ad
-EBUILD mapivi-0.9.1.ebuild 1253 RMD160 0cc6615c99494771296fe1dc42b47d29d0345c38 SHA1 6579832a0d889f43cb2df02271a7c0626f1189e5 SHA256 a6459023b1e6dd27600aa0ea778022593e571b02b23761db91bb3c43fe09ae7d
-MD5 4638d401d3d281d47babaef90cf9720d mapivi-0.9.1.ebuild 1253
-RMD160 0cc6615c99494771296fe1dc42b47d29d0345c38 mapivi-0.9.1.ebuild 1253
-SHA256 a6459023b1e6dd27600aa0ea778022593e571b02b23761db91bb3c43fe09ae7d mapivi-0.9.1.ebuild 1253
-EBUILD mapivi-8.1.0.ebuild 836 RMD160 04ff514bc4abc22dc8c82d273fdb41d46561c37f SHA1 c69b0f59c4683f76281b82452ed23ef965a9a87b SHA256 a855345b4fc98e3ace15adf5aec128d2edc43894ee47ce9f18ddeb2b2e137d8c
-MD5 5be9d1cdaedde88b3ac97f577f29f9fb mapivi-8.1.0.ebuild 836
-RMD160 04ff514bc4abc22dc8c82d273fdb41d46561c37f mapivi-8.1.0.ebuild 836
-SHA256 a855345b4fc98e3ace15adf5aec128d2edc43894ee47ce9f18ddeb2b2e137d8c mapivi-8.1.0.ebuild 836
-MISC ChangeLog 510 RMD160 02c59ab390196e266f6d6c0c4381b4aae54af3b7 SHA1 8bf3f6a3e21e15de0bd10157b22a51455d5165b4 SHA256 e6507e0040bb3c89e0527eed97f0389a5604af49153e5da335a11a7a1a318316
-MD5 f183a78a91aa3e209dd5984479581b31 ChangeLog 510
-RMD160 02c59ab390196e266f6d6c0c4381b4aae54af3b7 ChangeLog 510
-SHA256 e6507e0040bb3c89e0527eed97f0389a5604af49153e5da335a11a7a1a318316 ChangeLog 510
+EBUILD mapivi-0.9.1.ebuild 1237 RMD160 5bd2d3af988347dae599fbd1e008c66979a30bec SHA1 8b68f6ada89827e07a6f9494be3a271ed7ca3ee7 SHA256 cc0f0d472710e2a6b3fc9bf0e3cd244550a2d658d4eb407304ae96e3242227d3
+MD5 eca9742543c99ab4bd27f03f78140f6b mapivi-0.9.1.ebuild 1237
+RMD160 5bd2d3af988347dae599fbd1e008c66979a30bec mapivi-0.9.1.ebuild 1237
+SHA256 cc0f0d472710e2a6b3fc9bf0e3cd244550a2d658d4eb407304ae96e3242227d3 mapivi-0.9.1.ebuild 1237
+MISC ChangeLog 682 RMD160 5a57841ee9ba6512dbcb6cf33c5ecfe0d34fffb6 SHA1 46f862178360cc40f7865efb5c297e3d8c87e80a SHA256 d6d564141ca4988eaeaf50a8d6f3ad0e14b3594a1dddb403765384b291ca5c41
+MD5 3125e84922bf3667e13563f1305ee97d ChangeLog 682
+RMD160 5a57841ee9ba6512dbcb6cf33c5ecfe0d34fffb6 ChangeLog 682
+SHA256 d6d564141ca4988eaeaf50a8d6f3ad0e14b3594a1dddb403765384b291ca5c41 ChangeLog 682
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
@@ -19,6 +14,3 @@ SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata
 MD5 16710a8243d2895e9ad781d3432aef99 files/digest-mapivi-0.9.1 220
 RMD160 0692bb40b333a3ad038ed7009ae388b4edc216cd files/digest-mapivi-0.9.1 220
 SHA256 ee7766b7cc24499055526db37b96a7bddef7259223f9b5c4959d80bc2b0b5abb files/digest-mapivi-0.9.1 220
-MD5 a8dfa53d82e7545c99e8197362ee9f45 files/digest-mapivi-8.1.0 232
-RMD160 767963a0e593ba22e8a764cc068dda599c8308fb files/digest-mapivi-8.1.0 232
-SHA256 94935d6b1d7b88b70f368958d08d2f0ea5317a0acb3e252cea4695f044de83a6 files/digest-mapivi-8.1.0 232
diff --git a/media-gfx/mapivi/files/digest-mapivi-8.1.0 b/media-gfx/mapivi/files/digest-mapivi-8.1.0
deleted file mode 100644
index 16f6e4ee6..000000000
--- a/media-gfx/mapivi/files/digest-mapivi-8.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7a7f2acf960aa2bcf704fda2aeb1d1cf mapivi081.tar.bz2 199167
-RMD160 71cb179a8abe69b6b5e1767f60d66df4ee7591fa mapivi081.tar.bz2 199167
-SHA256 1ac70fb23dbcec14dd930af1ae3d10e078620d2db9cd5ae32ae1a8e75760e941 mapivi081.tar.bz2 199167
diff --git a/media-gfx/mapivi/mapivi-0.9.1.ebuild b/media-gfx/mapivi/mapivi-0.9.1.ebuild
index fc43771fd..bf5be9663 100644
--- a/media-gfx/mapivi/mapivi-0.9.1.ebuild
+++ b/media-gfx/mapivi/mapivi-0.9.1.ebuild
@@ -22,15 +22,18 @@ DEPEND="dev-lang/perl
 	media-libs/jpeg
 	dev-perl/Image-MetaData-JPEG"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e 's:$configdir/PlugIns:/usr/share/mapivi/plugins:' mapivi
+}
+
 src_install() {
-	into ${ROOT}/usr/bin
 	dobin mapivi
 
-	into ${ROOT}/usr/share/mapivi/plugins
-	dobin PlugIns/Channel-Separator PlugIns/Join-RGB PlugIns/checkDir-plugin\
-			PlugIns/filelist-plugin PlugIns/test-plugin
-	dodoc Changes.txt FAQ README Tips.txt
-	sed -i 's:$configdir\/PlugIns:\/usr\/share\/mapivi\/plugins:g' mapivi
+	exeinto /usr/share/mapivi/plugins
+	doexe PlugIns/{Channel-Separator,Join-RGB,checkDir-plugin,filelist-plugin,test-plugin}
+	dodoc Changes.txt FAQ README Tips.txt ToDo
 }
 
 pkg_postinst() {
diff --git a/media-gfx/mapivi/mapivi-8.1.0.ebuild b/media-gfx/mapivi/mapivi-8.1.0.ebuild
deleted file mode 100644
index f880b27aa..000000000
--- a/media-gfx/mapivi/mapivi-8.1.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-MY_P="${PN}081"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Picture manager / organizer written in Perl/Tk."
-HOMEPAGE="http://mapivi.sourceforge.net/mapivi.shtml"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.5
-	>=dev-perl/perl-tk-804.027
-	>=dev-perl/Image-MetaData-JPEG-0.14
-	dev-perl/ImageInfo"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e 's:$configdir/PlugIns:/usr/share/mapivi/plugins:' mapivi
-}
-
-src_install() {
-	dobin mapivi
-	dodir /usr/share/mapivi/plugins
-	exeinto /usr/share/mapivi/plugins
-	doexe PlugIns/{Channel-Separator,Join-RGB,checkDir-plugin,filelist-plugin,test-plugin}
-	dodoc Changes.txt FAQ README Tips.txt ToDo
-}