public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-libs/tiff: ChangeLog tiff-4.0.3-r3.ebuild
@ 2013-08-10 17:15 Alexis Ballier (aballier)
  0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier (aballier) @ 2013-08-10 17:15 UTC (permalink / raw
  To: gentoo-commits

aballier    13/08/10 17:15:29

  Modified:             ChangeLog tiff-4.0.3-r3.ebuild
  Log:
  Add blockers on emul-libs so that it is stacked for baselibs r10
  
  (Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.237                media-libs/tiff/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/tiff/ChangeLog?rev=1.237&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/tiff/ChangeLog?rev=1.237&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/tiff/ChangeLog?r1=1.236&r2=1.237

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- ChangeLog	10 Aug 2013 17:12:02 -0000	1.236
+++ ChangeLog	10 Aug 2013 17:15:29 -0000	1.237
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/tiff
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.236 2013/08/10 17:12:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.237 2013/08/10 17:15:29 aballier Exp $
+
+  10 Aug 2013; Alexis Ballier <aballier@gentoo.org> tiff-4.0.3-r3.ebuild:
+  Add blockers on emul-libs so that it is stacked for baselibs r10
 
 *tiff-4.0.3-r3 (10 Aug 2013)
 



1.2                  media-libs/tiff/tiff-4.0.3-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/tiff/tiff-4.0.3-r3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/tiff/tiff-4.0.3-r3.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/tiff/tiff-4.0.3-r3.ebuild?r1=1.1&r2=1.2

Index: tiff-4.0.3-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.3-r3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tiff-4.0.3-r3.ebuild	10 Aug 2013 17:12:02 -0000	1.1
+++ tiff-4.0.3-r3.ebuild	10 Aug 2013 17:15:29 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.3-r3.ebuild,v 1.1 2013/08/10 17:12:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.3-r3.ebuild,v 1.2 2013/08/10 17:15:29 aballier Exp $
 
 EAPI=5
 inherit eutils libtool multilib-minimal
@@ -18,7 +18,11 @@
 RDEPEND="jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
 	jbig? ( media-libs/jbigkit:=[${MULTILIB_USEDEP}] )
 	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
+	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
 DEPEND="${RDEPEND}"
 
 MULTILIB_WRAPPED_HEADERS=(





^ permalink raw reply	[flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/tiff: ChangeLog tiff-4.0.3-r3.ebuild
@ 2013-08-10 17:12 Alexis Ballier (aballier)
  0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier (aballier) @ 2013-08-10 17:12 UTC (permalink / raw
  To: gentoo-commits

aballier    13/08/10 17:12:02

  Modified:             ChangeLog
  Added:                tiff-4.0.3-r3.ebuild
  Log:
  Convert to multilib, bug #459820
  
  (Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.236                media-libs/tiff/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/tiff/ChangeLog?rev=1.236&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/tiff/ChangeLog?rev=1.236&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/tiff/ChangeLog?r1=1.235&r2=1.236

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- ChangeLog	5 Aug 2013 09:44:22 -0000	1.235
+++ ChangeLog	10 Aug 2013 17:12:02 -0000	1.236
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/tiff
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.235 2013/08/05 09:44:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.236 2013/08/10 17:12:02 aballier Exp $
+
+*tiff-4.0.3-r3 (10 Aug 2013)
+
+  10 Aug 2013; Alexis Ballier <aballier@gentoo.org> +tiff-4.0.3-r3.ebuild:
+  Convert to multilib, bug #459820
 
   05 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> tiff-4.0.3-r2.ebuild:
   Pull in correct SLOT of libjpeg for headers.



1.1                  media-libs/tiff/tiff-4.0.3-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/tiff/tiff-4.0.3-r3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/tiff/tiff-4.0.3-r3.ebuild?rev=1.1&content-type=text/plain

Index: tiff-4.0.3-r3.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.3-r3.ebuild,v 1.1 2013/08/10 17:12:02 aballier Exp $

EAPI=5
inherit eutils libtool multilib-minimal

DESCRIPTION="Tag Image File Format (TIFF) library"
HOMEPAGE="http://www.remotesensing.org/libtiff/"
SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
	ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"

LICENSE="libtiff"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+cxx jbig jpeg lzma static-libs zlib"

RDEPEND="jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
	jbig? ( media-libs/jbigkit:=[${MULTILIB_USEDEP}] )
	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}"

MULTILIB_WRAPPED_HEADERS=(
	/usr/include/tiffconf.h
)

src_prepare() {
	epatch "${FILESDIR}"/${PN}-4.0.3-tiff2pdf-colors.patch #145055
	epatch "${FILESDIR}"/${P}-CVE-2012-{4447,4564}.patch #440944
	epatch "${FILESDIR}"/${P}-CVE-2013-{1960,1961}.patch #468334
	epatch "${FILESDIR}"/${P}-libjpeg-turbo.patch

	elibtoolize
}

multilib_src_configure() {
	ECONF_SOURCE="${S}" econf \
		$(use_enable static-libs static) \
		$(use_enable zlib) \
		$(use_enable jpeg) \
		$(use_enable jbig) \
		$(use_enable lzma) \
		$(use_enable cxx) \
		--without-x \
		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}

	# remove useless subdirs
	if ! multilib_is_native_abi ; then
		sed -i \
			-e 's/ tools//' \
			-e 's/ contrib//' \
			-e 's/ man//' \
			-e 's/ html//' \
			Makefile || die
	fi
}

multilib_src_test() {
	if ! multilib_is_native_abi ; then
		cd tools
		emake
		cd "${BUILD_DIR}"
	fi
	emake check
}

multilib_src_install_all() {
	prune_libtool_files --all
	rm -f "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION}
}





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-08-10 17:16 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-10 17:15 [gentoo-commits] gentoo-x86 commit in media-libs/tiff: ChangeLog tiff-4.0.3-r3.ebuild Alexis Ballier (aballier)
  -- strict thread matches above, loose matches on Subject: below --
2013-08-10 17:12 Alexis Ballier (aballier)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox