diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2013-02-19 10:39:15 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2013-02-19 10:39:15 +0000 |
commit | 666361d082aa2e9ec57d6060b57ea2b674efc084 (patch) | |
tree | 7acce49ee8704f92e408a414671c838228ea5517 /media-gfx/iscan | |
parent | Version bump with new SRC_URI. Thanks to Jared in bug #455776. (diff) | |
download | gentoo-2-666361d082aa2e9ec57d6060b57ea2b674efc084.tar.gz gentoo-2-666361d082aa2e9ec57d6060b57ea2b674efc084.tar.bz2 gentoo-2-666361d082aa2e9ec57d6060b57ea2b674efc084.zip |
Version bump with new SRC_URI. Thanks to Jared in bug #455776.
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)
Diffstat (limited to 'media-gfx/iscan')
-rw-r--r-- | media-gfx/iscan/ChangeLog | 10 | ||||
-rw-r--r-- | media-gfx/iscan/files/iscan-2.29.1-drop-ltdl.patch | 64 | ||||
-rw-r--r-- | media-gfx/iscan/iscan-2.29.1.5.ebuild | 173 |
3 files changed, 245 insertions, 2 deletions
diff --git a/media-gfx/iscan/ChangeLog b/media-gfx/iscan/ChangeLog index 7f3bbafa10e3..58af45dbc963 100644 --- a/media-gfx/iscan/ChangeLog +++ b/media-gfx/iscan/ChangeLog @@ -1,6 +1,12 @@ # 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.52 2012/12/11 03:42:44 axs Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/ChangeLog,v 1.53 2013/02/19 10:39:15 flameeyes Exp $ + +*iscan-2.29.1.5 (19 Feb 2013) + + 19 Feb 2013; Diego E. Pettenò <flameeyes@gentoo.org> + +files/iscan-2.29.1-drop-ltdl.patch, +iscan-2.29.1.5.ebuild: + Version bump with new SRC_URI. Thanks to Jared in bug #455776. 11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> iscan-2.26.2.ebuild, iscan-2.28.1.3.ebuild: diff --git a/media-gfx/iscan/files/iscan-2.29.1-drop-ltdl.patch b/media-gfx/iscan/files/iscan-2.29.1-drop-ltdl.patch new file mode 100644 index 000000000000..489f0c5cd71e --- /dev/null +++ b/media-gfx/iscan/files/iscan-2.29.1-drop-ltdl.patch @@ -0,0 +1,64 @@ +diff -Naur iscan-2.29.1.orig/backend/Makefile.am iscan-2.29.1/backend/Makefile.am +--- iscan-2.29.1.orig/backend/Makefile.am 2012-06-11 23:33:33.000000000 -0500 ++++ iscan-2.29.1/backend/Makefile.am 2013-02-18 20:29:05.091814060 -0600 +@@ -58,7 +58,6 @@ + + libepkowa_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ +- $(LTDLINCL) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/non-free \ + $(XML_CFLAGS) \ +@@ -70,7 +69,7 @@ + -lm \ + $(XML_LIBS) \ + $(LIBUSB_1_0_LIBS) \ +- $(LIBLTDL) ++ -lltdl + libepkowa_la_SOURCES = \ + $(sane_backends_files) \ + ipc.c \ +diff -Naur iscan-2.29.1.orig/configure.ac iscan-2.29.1/configure.ac +--- iscan-2.29.1.orig/configure.ac 2012-06-11 23:33:34.000000000 -0500 ++++ iscan-2.29.1/configure.ac 2013-02-18 20:30:10.413311997 -0600 +@@ -266,13 +266,10 @@ + dnl The somewhat obscure LT_AC_PROG_SED is here to make sure that the + dnl SED environment variable gets set before it's used by the libtool + dnl machinery. This works around buggy libtool versions. +-LT_AC_PROG_SED +-AC_LIBLTDL_INSTALLABLE +-AC_LIBTOOL_DLOPEN + AC_PROG_LIBTOOL +-AC_LIB_LTDL +-AC_SUBST(LTDLINCL) +-AC_SUBST(LIBLTDL) ++AC_LTDL_SHLIBPATH ++AC_LTDL_SHLIBEXT ++AC_LTDL_SYSSEARCHPATH + + + dnl Graphic file format options +diff -Naur iscan-2.29.1.orig/frontend/Makefile.am iscan-2.29.1/frontend/Makefile.am +--- iscan-2.29.1.orig/frontend/Makefile.am 2012-06-11 23:33:33.000000000 -0500 ++++ iscan-2.29.1/frontend/Makefile.am 2013-02-18 20:30:38.764092975 -0600 +@@ -34,7 +34,7 @@ + iscan_LDADD = \ + $(top_builddir)/lib/libimage-stream.la \ + -lsane \ +- @LIBLTDL@ \ ++ -lltdl \ + @GTK_LIBS@ \ + @GDK_IMLIB_LIBS@ \ + $(top_builddir)/non-free/libesmod.so +diff -Naur iscan-2.29.1.orig/lib/Makefile.am iscan-2.29.1/lib/Makefile.am +--- iscan-2.29.1.orig/lib/Makefile.am 2012-06-11 23:33:34.000000000 -0500 ++++ iscan-2.29.1/lib/Makefile.am 2013-02-18 20:30:58.852936051 -0600 +@@ -30,7 +30,7 @@ + libimage_stream_la_CPPFLAGS = -I$(top_srcdir)/include + libimage_stream_la_LDFLAGS = -static + libimage_stream_la_LIBADD = \ +- $(LIBLTDL) \ ++ -lltdl \ + $(top_builddir)/lib/pdf/libpdf.la + libimage_stream_la_SOURCES = \ + $(libimage_stream_la_files) diff --git a/media-gfx/iscan/iscan-2.29.1.5.ebuild b/media-gfx/iscan/iscan-2.29.1.5.ebuild new file mode 100644 index 000000000000..c492994f298a --- /dev/null +++ b/media-gfx/iscan/iscan-2.29.1.5.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.29.1.5.ebuild,v 1.1 2013/02/19 10:39:15 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)" +MY_PVR="$(replace_version_separator 3 -)" +MY_DOC="userg_revQ" + +DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)" +HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX" +SRC_URI="http://dev.gentoo.org/~flameeyes/avasys/${PN}_${MY_PVR}.tar.gz + doc? ( http://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf + linguas_ja? ( http://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.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_FLAGS_IGNORED="${QA_PRESTRIPPED}" + +# Upstream ships broken sanity test +RESTRICT="test" + +RDEPEND="media-gfx/iscan-data + media-gfx/sane-backends + virtual/udev + 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 )" + +S="${WORKDIR}/${PN}-${MY_PV}" + +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.29.1-drop-ltdl.patch + epatch "${FILESDIR}"/iscan-2.25.0-fix-g++-test.patch + epatch "${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch + + eautoreconf +} + +src_configure() { + append-cppflags -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} + if use linguas_ja; then + doins "${DISTDIR}/${MY_DOC}_j.pdf" + else + doins "${DISTDIR}/${MY_DOC}_e.pdf" + fi + 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 +} |