Version bump.

Package-Manager: portage-2.2.0_alpha109/cvs/Linux x86_64

6 files changed, 304 insertions, 5 deletions

diff --git a/media-gfx/iscan-data/ChangeLog b/media-gfx/iscan-data/ChangeLog
index 0579ed8896b0..27298b601a82 100644
--- a/media-gfx/iscan-data/ChangeLog
+++ b/media-gfx/iscan-data/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/iscan-data
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan-data/ChangeLog,v 1.7 2011/10/16 17:51:08 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan-data/ChangeLog,v 1.8 2012/06/04 21:12:18 flameeyes Exp $
+
+*iscan-data-1.13.0.1 (04 Jun 2012)
+
+  04 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +iscan-data-1.13.0.1.ebuild:
+  Version bump.
 
   16 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -iscan-data-1.0.1.ebuild,
   -iscan-data-1.8.0.ebuild:
diff --git a/media-gfx/iscan-data/iscan-data-1.13.0.1.ebuild b/media-gfx/iscan-data/iscan-data-1.13.0.1.ebuild
new file mode 100644
index 000000000000..c875f64ad0e2
--- /dev/null
+++ b/media-gfx/iscan-data/iscan-data-1.13.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan-data/iscan-data-1.13.0.1.ebuild,v 1.1 2012/06/04 21:12:18 flameeyes Exp $
+
+EAPI=4
+
+inherit eutils versionator
+
+MY_PV="$(get_version_component_range 1-3)"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DESCRIPTION="Image Scan! for Linux data files"
+HOMEPAGE="http://avasys.jp/english/linux_e/"
+SRC_URI="http://linux.avasys.jp/drivers/${PN}/${MY_PV}/${PN}_$(replace_version_separator 3 -).tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libxslt"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# create udev rules
+	dodir /lib/udev/rules.d
+	"${D}usr/lib64/iscan-data/make-policy-file" \
+		--force --quiet --mode udev \
+		-d "${D}usr/share/iscan-data/epkowa.desc" \
+		-o "${D}lib/udev/rules.d/99-iscan.rules"
+
+	# install docs
+	dodoc NEWS SUPPORTED-DEVICES KNOWN-PROBLEMS
+}
diff --git a/media-gfx/iscan-plugin-gt-s80/ChangeLog b/media-gfx/iscan-plugin-gt-s80/ChangeLog
index 46bd9f3e3ee5..afa5e2ff3969 100644
--- a/media-gfx/iscan-plugin-gt-s80/ChangeLog
+++ b/media-gfx/iscan-plugin-gt-s80/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/iscan-plugin-gt-s80
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan-plugin-gt-s80/ChangeLog,v 1.2 2011/07/27 19:21:21 flameeyes Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan-plugin-gt-s80/ChangeLog,v 1.3 2012/06/04 21:13:45 flameeyes Exp $
+
+*iscan-plugin-gt-s80-0.2.0.2 (04 Jun 2012)
+
+  04 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +iscan-plugin-gt-s80-0.2.0.2.ebuild:
+  Version bump.
 
 *iscan-plugin-gt-s80-0.1.1.2 (27 Jul 2011)
 
diff --git a/media-gfx/iscan-plugin-gt-s80/iscan-plugin-gt-s80-0.2.0.2.ebuild b/media-gfx/iscan-plugin-gt-s80/iscan-plugin-gt-s80-0.2.0.2.ebuild
new file mode 100644
index 000000000000..a6c7262c5f14
--- /dev/null
+++ b/media-gfx/iscan-plugin-gt-s80/iscan-plugin-gt-s80-0.2.0.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan-plugin-gt-s80/iscan-plugin-gt-s80-0.2.0.2.ebuild,v 1.1 2012/06/04 21:13:45 flameeyes Exp $
+
+EAPI=4
+
+inherit rpm versionator
+
+MY_PN="esci-interpreter-${PN#iscan-plugin-}"
+MY_PV="$(get_version_component_range 1-3)"
+MY_PVR="$(replace_version_separator 3 -)"
+
+DESCRIPTION="Epson GT-S50 and GT-S80 scanner plugins for SANE 'epkowa' backend."
+HOMEPAGE="http://www.avasys.jp/english/linux_e/dl_scan.html"
+SRC_URI="
+	x86? ( http://linux.avasys.jp/drivers/iscan-plugins/${MY_PN}/${MY_PV}/${MY_PN}-${MY_PVR}.i386.rpm )
+	amd64? ( http://linux.avasys.jp/drivers/iscan-plugins/${MY_PN}/${MY_PV}/${MY_PN}-${MY_PVR}.x86_64.rpm )
+"
+
+LICENSE="AVASYS"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+IUSE=""
+
+DEPEND=">=media-gfx/iscan-2.28.0"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+QA_PRESTRIPPED="/opt/iscan/esci/*"
+
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	dodoc usr/share/doc/*/*
+
+	# install scanner plugins
+	exeinto /opt/iscan/esci
+	doexe "${WORKDIR}/usr/$(get_libdir)/esci/"*
+}
+
+pkg_setup() {
+	basecmds=(
+		"iscan-registry --COMMAND interpreter usb 0x04b8 0x0136 /opt/iscan/esci/libesci-interpreter-gt-s80"
+		"iscan-registry --COMMAND interpreter usb 0x04b8 0x0137 /opt/iscan/esci/libesci-interpreter-gt-s50"
+		"iscan-registry --COMMAND interpreter usb 0x04b8 0x0144 /opt/iscan/esci/libesci-interpreter-gt-s80"
+		"iscan-registry --COMMAND interpreter usb 0x04b8 0x0143 /opt/iscan/esci/libesci-interpreter-gt-s50"
+	)
+}
+
+pkg_postinst() {
+	[[ -n ${REPLACING_VERSIONS} ]] && return
+
+	if [[ ${ROOT} == "/" ]]; then
+		for basecmd in "${basecmds[@]}"; do
+			eval ${basecmd/COMMAND/add}
+		done
+	else
+		ewarn "Unable to register the plugin and firmware when installing outside of /."
+		ewarn "execute the following command yourself:"
+		for basecmd in "${basecmds[@]}"; do
+			ewarn "${basecmd/COMMAND/add}"
+		done
+	fi
+}
+
+pkg_prerm() {
+	[[ -n ${REPLACED_BY_VERSION} ]] && return
+
+	if [[ ${ROOT} == "/" ]]; then
+		for basecmd in "${basecmds[@]}"; do
+			eval ${basecmd/COMMAND/remove}
+		done
+	else
+		ewarn "Unable to register the plugin and firmware when installing outside of /."
+		ewarn "execute the following command yourself:"
+		for basecmd in "${basecmds[@]}"; do
+			ewarn "${basecmd/COMMAND/remove}"
+		done
+	fi
+}
diff --git a/media-gfx/iscan/ChangeLog b/media-gfx/iscan/ChangeLog
index 8b7a4b9d4f95..af87ae1a9f8f 100644
--- a/media-gfx/iscan/ChangeLog
+++ b/media-gfx/iscan/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/iscan
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/ChangeLog,v 1.48 2012/05/22 16:17:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/ChangeLog,v 1.49 2012/06/04 21:11:50 flameeyes Exp $
+
+*iscan-2.28.1.3 (04 Jun 2012)
+
+  04 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org> +iscan-2.28.1.3.ebuild:
+  Version bump.
 
   22 May 2012; Samuli Suominen <ssuominen@gentoo.org> iscan-2.26.2.ebuild:
   Use virtual/libusb instead of dev-libs/libusb.
diff --git a/media-gfx/iscan/iscan-2.28.1.3.ebuild b/media-gfx/iscan/iscan-2.28.1.3.ebuild
new file mode 100644
index 000000000000..625dac5d026a
--- /dev/null
+++ b/media-gfx/iscan/iscan-2.28.1.3.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.28.1.3.ebuild,v 1.1 2012/06/04 21:11:50 flameeyes Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic autotools versionator
+
+# HINTS:
+# -> non-free modules are x86 and amd64 only
+# -> iscan frontend needs non-free modules
+# -> sane-epkowa should be usable on every arch
+# -> ${P}-${SRC_REV}.tar.gz    (for gcc 3.2/3.3)
+# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
+
+# FIXME:
+# Make jpeg/png optional. The problem is, that the configure script ignores --disable-*,
+# if the corresponding lib is found on the system.
+# Furthermore, iscan doesn't compile w/o libusb, this should be fixed somehow.
+
+# TODO:
+# (re)add closed-source binary modules which are needed for some scanners.
+
+KEYWORDS="~amd64 ~x86"
+
+MY_PV="$(get_version_component_range 1-3)"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
+HOMEPAGE="http://www.avasys.jp/english/linux_e/dl_scan.html"
+SRC_URI="http://linux.avasys.jp/drivers/${PN}/${MY_PV}/${PN}_$(replace_version_separator 3 -).tar.gz
+	doc? ( http://linux.avasys.jp/drivers/iscan/doc/userg_revL_e.pdf )"
+LICENSE="GPL-2 AVASYS"
+SLOT="0"
+
+IUSE="X gimp jpeg png tiff doc"
+IUSE_LINGUAS="ar de es fr it ja ko nl pt zh_CN zh_TW"
+
+for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
+
+QA_PRESTRIPPED="usr/$(get_libdir)/libesmod.so.*"
+QA_TEXTRELS="${QA_PRESTRIPPED}"
+QA_DT_HASH="${QA_PRESTRIPPED}"
+
+# Upstream ships broken sanity test
+RESTRICT="test"
+
+RDEPEND="media-gfx/iscan-data
+	media-gfx/sane-backends
+	>=sys-fs/udev-103
+	virtual/libusb:0
+	X? (
+		x11-libs/gtk+:2
+		gimp? ( media-gfx/gimp )
+		png? ( media-libs/libpng )
+		jpeg? ( virtual/jpeg )
+		tiff? ( media-libs/tiff )
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	X? ( sys-devel/gettext )"
+
+src_prepare() {
+	local i
+
+	# convert japanese docs to UTF-8
+	if use linguas_ja; then
+		for i in {NEWS,README}.ja non-free/*.ja.txt; do
+			if [ -f "${i}" ]; then
+				echo ">>> Converting ${i} to UTF-8"
+				iconv -f eucjp -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
+			fi
+		done
+	fi
+
+	# disable checks for gtk+
+	if ! use X; then
+		sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
+			-e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac
+	fi
+
+	epatch "${FILESDIR}"/iscan-2.25.0-drop-ltdl.patch
+	epatch "${FILESDIR}"/iscan-2.25.0-fix-g++-test.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -D_GNU_SOURCE  # needed for 'strndup'
+	local myconf="--enable-dependency-reduction"
+
+	if use X; then
+		myconf="${myconf}
+			--enable-frontend
+			$(use_enable gimp)
+			$(use_enable jpeg)
+			$(use_enable png)
+			$(use_enable tiff)"
+	else
+		myconf="${myconf}
+			--disable-frontend --disable-gimp
+			--disable-jpeg --disable-png --disable-tiff"
+	fi
+
+	econf --disable-static ${myconf}
+}
+
+src_install() {
+	local MY_LIB="/usr/$(get_libdir)"
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# install docs
+	dodoc AUTHORS NEWS README
+	use linguas_ja && dodoc NEWS.ja README.ja
+
+	# install sane config
+	insinto /etc/sane.d
+	doins backend/epkowa.conf
+
+	# install extra docs
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins "${DISTDIR}/userg_revL_e.pdf"
+	fi
+
+	# link iscan so it is seen as a plugin in gimp
+	if use X && use gimp; then
+		local plugindir
+		if [ -x /usr/bin/gimptool ]; then
+			plugindir="$(gimptool --gimpplugindir)/plug-ins"
+		elif [ -x /usr/bin/gimptool-2.0 ]; then
+			plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
+		else
+			die "Can't find GIMP plugin directory."
+		fi
+		dodir "${plugindir}"
+		dosym /usr/bin/iscan "${plugindir}"
+	fi
+
+	# install desktop entry
+	if use X; then
+		make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
+	fi
+}
+
+pkg_postinst() {
+	local i
+	local DLL_CONF="/etc/sane.d/dll.conf"
+	local EPKOWA_CONF="/etc/sane.d/epkowa.conf"
+
+	elog
+	if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
+		elog "Please edit ${EPKOWA_CONF} to suit your needs."
+	elif grep -q "\<epkowa\>" ${DLL_CONF}; then
+		elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
+		elog "Then edit ${EPKOWA_CONF} to suit your needs."
+	else
+		echo "epkowa" >> ${DLL_CONF}
+		elog "A new entry 'epkowa' was added to ${DLL_CONF}"
+		elog "Please edit ${EPKOWA_CONF} to suit your needs."
+	fi
+}