diff options
| author |   Jean-Noël Rivasseau <elvanor@gentoo.org> | 2009-09-23 10:43:24 +0000 |
|---|---|---|
| committer | Jean-Noël Rivasseau <elvanor@gentoo.org> | 2009-09-23 10:43:24 +0000 |
| commit | e9468fe11fb9ad735e5c806b529f1848211615db (patch) | |
| tree | 87873db91118509e4d480a0ddb54db70a10d4142 /media-gfx/iscan | |
| parent | iscan X flag handling - bug #285951. (diff) | |
| download | historical-e9468fe11fb9ad735e5c806b529f1848211615db.tar.gz historical-e9468fe11fb9ad735e5c806b529f1848211615db.tar.bz2 historical-e9468fe11fb9ad735e5c806b529f1848211615db.zip | |
Cleanups for #285951.
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'media-gfx/iscan')
| -rw-r--r-- | media-gfx/iscan/Manifest | 2 | ||||
| -rw-r--r-- | media-gfx/iscan/iscan-2.21.0.ebuild | 36 |
2 files changed, 14 insertions, 24 deletions
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest index 8375877c945c..cbe31dd94c66 100644 --- a/media-gfx/iscan/Manifest +++ b/media-gfx/iscan/Manifest @@ -17,6 +17,6 @@ DIST iscan-plugin-gt-x770-2.1.0-0.c2.i386.rpm 166476 RMD160 123a686c2d5abcd2d319 DIST iscan_2.11.0-1.tar.gz 1458880 RMD160 7ac5777d57afa2c0a76cac0808a3aaf7c354edf5 SHA1 a7fe77ded2f788a7bed6b0fa8377c43e6cf6e077 SHA256 ae0a72647acfa4cedc320e280014d3cdf8d61c0f4e2a7e941697cf2f36bed0a8 DIST iscan_2.21.0-6.tar.gz 1075613 RMD160 63cf65faa154ff08c8245ed6ed894afdfd249043 SHA1 9bcf8d004390e9afc920874ef3b5e73607d0db49 SHA256 d5687a20443009cea15d4c158b10bbdffadfd5499fbcb7a902333340859da18b EBUILD iscan-2.11.0.ebuild 9627 RMD160 6269364ef4196572c4b3c10fafd861c5ed47ce11 SHA1 d5f0434ac802bd43d7390045ac1acf0613897892 SHA256 418dca91a175b26c1c7fa37cdb5d46bcb21dc1a50a8016a5ebef595544cdbaee -EBUILD iscan-2.21.0.ebuild 6931 RMD160 de8c195fc61c44b00831694619688ffc2bf01590 SHA1 e9d02672841eaffa598d92ba7dfc42a5db4ab3e3 SHA256 e805eba6ce44874113c63836aec3ba262c503cd9f7a72893a20064717ebce8ad +EBUILD iscan-2.21.0.ebuild 6784 RMD160 9f0cf3213bfe6efec179ed2c18ea787f812e60f2 SHA1 fc04459e482c3b36da2f24319805108d4c95afc1 SHA256 a42235bae17fd6019b8b1ef4dbb2dc54d1028ceacb475e88fa841296afd8c95d MISC ChangeLog 5337 RMD160 b13609ddba4864aa73b1398855874d50fd3571a0 SHA1 1f20c2275008ee4c5eda25682a98969760867cd0 SHA256 932846e14e19b3681ba88abb8f819359e2656e0bd2828fe4f8a11cd6eab474aa MISC metadata.xml 674 RMD160 9337250d90495a96a34e5e3b6db2b5125f75e8cb SHA1 6405fc64d508b081a27c420828302dadd05fafe9 SHA256 9c1fe69dd2b3ba142164829a8725afdc1f573f597d4decd024d006c6321efe26 diff --git a/media-gfx/iscan/iscan-2.21.0.ebuild b/media-gfx/iscan/iscan-2.21.0.ebuild index bfcf0dc648a5..a6b18b5b67be 100644 --- a/media-gfx/iscan/iscan-2.21.0.ebuild +++ b/media-gfx/iscan/iscan-2.21.0.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.21.0.ebuild,v 1.1 2009/09/21 15:09:10 elvanor Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.21.0.ebuild,v 1.2 2009/09/23 10:43:24 elvanor Exp $ EAPI="2" -inherit eutils toolchain-funcs flag-o-matic rpm +inherit eutils toolchain-funcs flag-o-matic SRC_REV="6" # revision used by upstream @@ -30,36 +30,26 @@ SRC_URI="http://linux.avasys.jp/drivers/iscan/${PV}/${PN}_${PV}-${SRC_REV}.tar.g LICENSE="GPL-2 AVASYS" SLOT="0" -IUSE="X gimp jpeg unicode png tiff" +IUSE="X gimp jpeg png tiff unicode" IUSE_LINGUAS="de es fr it ja ko nl pt zh_CN zh_TW" for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done QA_TEXTRELS="usr/$(get_libdir)/iscan/lib*" -CDEPEND="media-gfx/sane-backends +RDEPEND="media-gfx/sane-backends png? ( media-libs/libpng ) jpeg? ( media-libs/jpeg ) tiff? ( media-libs/tiff ) >=sys-fs/udev-103 >=dev-libs/libusb-0.1.12 - x86? ( - X? ( - sys-devel/gettext - >=x11-libs/gtk+-2.0 - gimp? ( media-gfx/gimp ) - ) - ) - amd64? ( - X? ( - sys-devel/gettext - >=x11-libs/gtk+-2.0 - gimp? ( media-gfx/gimp ) - ) + X? ( + >=x11-libs/gtk+-2.0 + gimp? ( media-gfx/gimp ) )" -RDEPEND="${CDEPEND}" -DEPEND="${CDEPEND}" +DEPEND="${RDEPEND} + X? ( sys-devel/gettext )" usermap_to_udev() { echo '# udev rules file for iscan devices (udev >= 0.98)' @@ -140,17 +130,18 @@ src_prepare() { -e 's:^\([[:space:]]*\)po[[:space:]]*\\:\1\\:g' Makefile* sed -i -e 's:iscan.1::g' doc/Makefile* fi + + #eautoreconf } -src_compile() { +src_configure() { append-flags -D_GNU_SOURCE # needed for 'strndup' # hint: dirty hack, look into 'configure.ac' for 'PACKAGE_CXX_ABI' CXX="g++" econf \ $(use_enable jpeg) \ $(use_enable png) \ $(use_enable tiff) \ - --with-pic \ - --disable-static \ + --with-pic --disable-static \ $(if (( use x86 || use amd64) && use X ); then echo $(use_enable gimp) \ --enable-frontend @@ -158,7 +149,6 @@ src_compile() { --disable-frontend fi) \ || die "econf failed" - emake || die "emake failed" } src_install() { |