Drop useless support for ancient zlib to avoid autoreconf. As a side effect, fixes bug #423705.

(Portage version: 2.2.0_alpha118/cvs/Linux x86_64)

4 files changed, 13 insertions, 60 deletions

diff --git a/media-gfx/simple-scan/ChangeLog b/media-gfx/simple-scan/ChangeLog
index 53b67569b6b5..4d4f3d8b63ca 100644
--- a/media-gfx/simple-scan/ChangeLog
+++ b/media-gfx/simple-scan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/simple-scan
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/simple-scan/ChangeLog,v 1.15 2012/05/05 07:00:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/simple-scan/ChangeLog,v 1.16 2012/07/17 06:37:00 tetromino Exp $
+
+  17 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/simple-scan-2.31.90.2-support-non-pkgconfig-zlib.patch,
+  simple-scan-2.32.0.2.ebuild, simple-scan-3.2.1.ebuild:
+  Drop useless support for ancient zlib to avoid autoreconf. As a side effect,
+  fixes bug #423705.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> simple-scan-2.32.0.2.ebuild,
   simple-scan-3.2.1.ebuild:
diff --git a/media-gfx/simple-scan/files/simple-scan-2.31.90.2-support-non-pkgconfig-zlib.patch b/media-gfx/simple-scan/files/simple-scan-2.31.90.2-support-non-pkgconfig-zlib.patch
deleted file mode 100644
index 75b0adcf9013..000000000000
--- a/media-gfx/simple-scan/files/simple-scan-2.31.90.2-support-non-pkgconfig-zlib.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: simple-scan-2.31.90.2/configure.ac
-===================================================================
---- simple-scan-2.31.90.2.orig/configure.ac	2010-08-30 08:49:27.000000000 +1000
-+++ simple-scan-2.31.90.2/configure.ac	2010-08-30 08:49:41.147411001 +1000
-@@ -30,7 +30,6 @@
-     gconf-2.0
-     gmodule-export-2.0
-     gthread-2.0
--    zlib
-     cairo
-     gdk-pixbuf-2.0
-     cairo-pdf
-@@ -41,6 +40,7 @@
- 
- AC_CHECK_HEADERS([sane/sane.h],[],[AC_MSG_ERROR([SANE not found])])
- AC_CHECK_HEADERS([sane/saneopts.h],[],[AC_MSG_ERROR([SANE not found])])
-+AC_CHECK_HEADERS([zlib.h],[],[AC_MSG_ERROR([ZLib not found])])
- AC_CHECK_HEADERS([jpeglib.h],[],[AC_MSG_ERROR([libjpeg not found])])
- 
- dnl ###########################################################################
-Index: simple-scan-2.31.90.2/src/Makefile.am
-===================================================================
---- simple-scan-2.31.90.2.orig/src/Makefile.am	2010-08-30 08:49:24.000000000 +1000
-+++ simple-scan-2.31.90.2/src/Makefile.am	2010-08-30 08:49:29.997411002 +1000
-@@ -30,6 +30,7 @@
- 	$(SIMPLE_SCAN_LIBS) \
- 	-lsane \
- 	-ljpeg \
-+	-lz \
- 	-lm
- 
- DISTCLEANFILES = \
diff --git a/media-gfx/simple-scan/simple-scan-2.32.0.2.ebuild b/media-gfx/simple-scan/simple-scan-2.32.0.2.ebuild
index 44ff85468079..203091d37dc6 100644
--- a/media-gfx/simple-scan/simple-scan-2.32.0.2.ebuild
+++ b/media-gfx/simple-scan/simple-scan-2.32.0.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/simple-scan/simple-scan-2.32.0.2.ebuild,v 1.5 2012/05/05 07:00:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/simple-scan/simple-scan-2.32.0.2.ebuild,v 1.6 2012/07/17 06:37:00 tetromino Exp $
 
 EAPI=3
 
 GCONF_DEBUG="no"
 
-inherit autotools eutils gnome2
+inherit gnome2
 
 DESCRIPTION="Simple document scanning utility"
 HOMEPAGE="https://launchpad.net/simple-scan"
@@ -24,25 +24,14 @@ COMMON_DEPEND="
 	>=media-gfx/sane-backends-1.0.20
 	virtual/jpeg
 	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
-	sys-libs/zlib
+	>=sys-libs/zlib-1.2.3.1
 	x11-libs/cairo"
 RDEPEND="${COMMON_DEPEND}
 	x11-misc/xdg-utils
 	x11-themes/gnome-icon-theme"
 DEPEND="${COMMON_DEPEND}
 	app-text/gnome-doc-utils
-	gnome-base/gnome-common
 	>=dev-util/intltool-0.35.0
 	virtual/pkgconfig"
 
 DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Expects a zlib with pkg-config support (>=1.2.5).
-	epatch "${FILESDIR}"/${PN}-2.31.90.2-support-non-pkgconfig-zlib.patch
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
diff --git a/media-gfx/simple-scan/simple-scan-3.2.1.ebuild b/media-gfx/simple-scan/simple-scan-3.2.1.ebuild
index 88eb00441e7e..772bc2980fe2 100644
--- a/media-gfx/simple-scan/simple-scan-3.2.1.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.2.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/simple-scan/simple-scan-3.2.1.ebuild,v 1.4 2012/05/05 07:00:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/simple-scan/simple-scan-3.2.1.ebuild,v 1.5 2012/07/17 06:37:00 tetromino Exp $
 
 EAPI="4"
 
 GCONF_DEBUG="no"
 
-inherit autotools eutils gnome2
+inherit gnome2
 
 DESCRIPTION="Simple document scanning utility"
 HOMEPAGE="https://launchpad.net/simple-scan"
@@ -22,7 +22,7 @@ COMMON_DEPEND="
 	>=media-gfx/sane-backends-1.0.20
 	virtual/jpeg
 	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
-	sys-libs/zlib
+	>=sys-libs/zlib-1.2.3.1
 	x11-libs/cairo
 	>=x11-libs/gtk+-3:3
 	x11-misc/colord[scanner]
@@ -41,13 +41,3 @@ pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README"
 	G2CONF="${G2CONF} VALAC=$(type -p valac-0.14)"
 }
-
-src_prepare() {
-	# Expects a zlib with pkg-config support (>=1.2.5).
-	epatch "${FILESDIR}"/${PN}-2.31.90.2-support-non-pkgconfig-zlib.patch
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-
-	gnome2_src_prepare
-}