Version bump + cleanup

9 files changed, 35 insertions, 103 deletions

diff --git a/media-gfx/xsane/ChangeLog b/media-gfx/xsane/ChangeLog
index cfcbef030566..7f65bbe8ea26 100644
--- a/media-gfx/xsane/ChangeLog
+++ b/media-gfx/xsane/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-gfx/xsane
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.20 2004/07/31 02:57:52 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.21 2004/09/09 15:37:13 phosphan Exp $
+
+*xsane-0.95 (09 Sep 2004)
+
+  09 Sep 2004; Patrick Kursawe <phosphan@gentoo.org> -xsane-0.86-r1.ebuild,
+  -xsane-0.90.ebuild, -xsane-0.92.ebuild, +xsane-0.95.ebuild:
+  Cleanup
+
+*xsane-0.95 (09 Sep 2004)
+
+  09 Sep 2004; Patrick Kursawe <phosphan@gentoo.org> +xsane-0.95.ebuild:
+  Version bump.
 
   31 Jul 2004; Tom Gall <tgall@gentoo.org> xsane-0.93.ebuild:
   stable on ppc64, bug #57132
diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
index d4c9247d059a..4bbda78c8968 100644
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@@ -1,12 +1,14 @@
-MD5 49c137e2e0f8cbee2cdfc9d15a198ade ChangeLog 2567
-MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 72fd6d7b4b65d143c94a8dc72a7cbd83 xsane-0.86-r1.ebuild 978
-MD5 944c1811366e2c0b2a622172cd511bd7 xsane-0.90.ebuild 1051
 MD5 67a434ebc6d1f88f08796bfa45a26e55 xsane-0.91.ebuild 1300
-MD5 3bbb3ce183d12139eec97974e3459cc8 xsane-0.92.ebuild 1146
 MD5 07db658e079b67e9afe635608d6a4085 xsane-0.93.ebuild 1144
-MD5 8de50a8739761e8d1cfd1b4e6409b66a files/digest-xsane-0.86-r1 63
+MD5 660e5115c3a3fa236f748980f6f8248b xsane-0.95.ebuild 1349
+MD5 944c1811366e2c0b2a622172cd511bd7 xsane-0.90.ebuild 1051
+MD5 72fd6d7b4b65d143c94a8dc72a7cbd83 xsane-0.86-r1.ebuild 978
+MD5 3bbb3ce183d12139eec97974e3459cc8 xsane-0.92.ebuild 1146
+MD5 49c137e2e0f8cbee2cdfc9d15a198ade ChangeLog 2567
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 MD5 e048f5d9cf2c47be4638753bdc659554 files/digest-xsane-0.90 63
 MD5 47560da8eff54c663c54a71ebf16b7cb files/digest-xsane-0.91 63
 MD5 4f657211aaf393b1f99e452674df4943 files/digest-xsane-0.92 63
 MD5 fe7857f02174456de620f30b19323804 files/digest-xsane-0.93 63
+MD5 253d4e47a0b33d8bb9a060940a16cb1b files/digest-xsane-0.95 63
+MD5 8de50a8739761e8d1cfd1b4e6409b66a files/digest-xsane-0.86-r1 63
diff --git a/media-gfx/xsane/files/digest-xsane-0.86-r1 b/media-gfx/xsane/files/digest-xsane-0.86-r1
deleted file mode 100644
index 43b011f6822d..000000000000
--- a/media-gfx/xsane/files/digest-xsane-0.86-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 038dffe5643c6988f74e54a6b194732a xsane-0.86.tar.gz 2259870
diff --git a/media-gfx/xsane/files/digest-xsane-0.90 b/media-gfx/xsane/files/digest-xsane-0.90
deleted file mode 100644
index 85615162c8fd..000000000000
--- a/media-gfx/xsane/files/digest-xsane-0.90
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ecf7073f673126cecbe999939638d0a2 xsane-0.90.tar.gz 2541153
diff --git a/media-gfx/xsane/files/digest-xsane-0.92 b/media-gfx/xsane/files/digest-xsane-0.92
deleted file mode 100644
index d1250d81c7b2..000000000000
--- a/media-gfx/xsane/files/digest-xsane-0.92
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a5504d63cc5c9edb9ec484bd74581177 xsane-0.92.tar.gz 2555676
diff --git a/media-gfx/xsane/files/digest-xsane-0.95 b/media-gfx/xsane/files/digest-xsane-0.95
new file mode 100644
index 000000000000..d0565f695dba
--- /dev/null
+++ b/media-gfx/xsane/files/digest-xsane-0.95
@@ -0,0 +1 @@
+MD5 164b7491ce833300903e38ac38c7d177 xsane-0.95.tar.gz 2867398
diff --git a/media-gfx/xsane/xsane-0.86-r1.ebuild b/media-gfx/xsane/xsane-0.86-r1.ebuild
deleted file mode 100644
index 1cb57b4b3043..000000000000
--- a/media-gfx/xsane/xsane-0.86-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.86-r1.ebuild,v 1.10 2004/06/24 22:53:07 agriffis Exp $
-
-DESCRIPTION="graphical scanning frontend"
-SRC_URI="http://www.xsane.org/download/${P}.tar.gz"
-HOMEPAGE="http://www.xsane.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-IUSE="nls jpeg png tiff"
-
-DEPEND="media-gfx/sane-backends
-	=x11-libs/gtk+-1.2*"
-
-src_compile() {
-	econf \
-		`use_enable nls` \
-		`use_enable jpeg` \
-		`use_enable png` \
-		`use_enable tiff` \
-		|| die
-	make || die
-}
-
-src_install() {
-	einstall || die
-	dodoc xsane.[A-Z]*
-	dohtml -r doc
-
-	# link xsane so it is seen as a plugin in gimp
-	if [ -d /usr/lib/gimp/1.2 ]; then
-		dodir /usr/lib/gimp/1.2/plug-ins
-		dosym /usr/bin/xsane /usr/lib/gimp/1.2/plug-ins
-	fi
-	if [ -d /usr/lib/gimp/1.3 ]; then
-		dodir /usr/lib/gimp/1.3/plug-ins
-		dosym /usr/bin/xsane /usr/lib/gimp/1.3/plug-ins
-	fi
-}
diff --git a/media-gfx/xsane/xsane-0.90.ebuild b/media-gfx/xsane/xsane-0.90.ebuild
deleted file mode 100644
index b128a716f9d9..000000000000
--- a/media-gfx/xsane/xsane-0.90.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.90.ebuild,v 1.9 2004/06/24 22:53:07 agriffis Exp $
-
-DESCRIPTION="graphical scanning frontend"
-SRC_URI="http://www.xsane.org/download/${P}.tar.gz"
-HOMEPAGE="http://www.xsane.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
-IUSE="gtk2 nls jpeg png tiff"
-
-DEPEND="media-gfx/sane-backends
-	|| (
-		gtk2? ( >=x11-libs/gtk+-2.0 )
-		=x11-libs/gtk+-1.2*
-	)
-	"
-
-src_compile() {
-	econf \
-		`use_enable nls` \
-		`use_enable jpeg` \
-		`use_enable png` \
-		`use_enable tiff` \
-		`use_enable gtk2` \
-		|| die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc xsane.[A-Z]*
-	dohtml -r doc
-
-	# link xsane so it is seen as a plugin in gimp
-	if [ -d /usr/lib/gimp/1.2 ]; then
-		dodir /usr/lib/gimp/1.2/plug-ins
-		dosym /usr/bin/xsane /usr/lib/gimp/1.2/plug-ins
-	fi
-#	if [ -d /usr/lib/gimp/1.3 ]; then
-#		dodir /usr/lib/gimp/1.3/plug-ins
-#		dosym /usr/bin/xsane /usr/lib/gimp/1.3/plug-ins
-#	fi
-}
diff --git a/media-gfx/xsane/xsane-0.92.ebuild b/media-gfx/xsane/xsane-0.95.ebuild
index 5ecb0320ae18..16cb382eddbd 100644
--- a/media-gfx/xsane/xsane-0.92.ebuild
+++ b/media-gfx/xsane/xsane-0.95.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.92.ebuild,v 1.7 2004/06/24 22:53:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.95.ebuild,v 1.1 2004/09/09 15:37:13 phosphan Exp $
 
 DESCRIPTION="graphical scanning frontend"
 SRC_URI="http://www.xsane.org/download/${P}.tar.gz"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.xsane.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc amd64 ~sparc"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~ppc64"
 IUSE="gtk2 nls jpeg png tiff"
 
 DEPEND="media-gfx/sane-backends
@@ -42,8 +42,16 @@ src_install() {
 		dodir /usr/lib/gimp/1.2/plug-ins
 		dosym /usr/bin/xsane /usr/lib/gimp/1.2/plug-ins
 	fi
-#	if [ -d /usr/lib/gimp/1.3 ]; then
-#		dodir /usr/lib/gimp/1.3/plug-ins
-#		dosym /usr/bin/xsane /usr/lib/gimp/1.3/plug-ins
-#	fi
+	if [ -d /usr/lib/gimp/2.0 ]; then
+		dodir /usr/lib/gimp/2.0/plug-ins
+		dosym /usr/bin/xsane /usr/lib/gimp/2.0/plug-ins
+	fi
+}
+
+pkg_postinst() {
+	einfo ""
+	ewarn "If you are upgrading from <=xsane-0.93, please make sure to"
+	ewarn "remove ~/.sane/xsane/xsane.rc _before_ you start xsane for"
+	ewarn "the first time."
+	einfo ""
 }