Version bump wrt #436932. Thanks to Mike Frysinger for reporting.

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

4 files changed, 150 insertions, 10 deletions

diff --git a/media-libs/libextractor/ChangeLog b/media-libs/libextractor/ChangeLog
index d839c14f39df..0462f21645c5 100644
--- a/media-libs/libextractor/ChangeLog
+++ b/media-libs/libextractor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libextractor
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/ChangeLog,v 1.75 2012/09/15 06:17:20 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/ChangeLog,v 1.76 2012/10/02 12:03:29 ssuominen Exp $
+
+*libextractor-1.0.0 (02 Oct 2012)
+
+  02 Oct 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +libextractor-1.0.0.ebuild, metadata.xml:
+  Version bump wrt #436932. Thanks to Mike Frysinger for reporting.
 
   15 Sep 2012; Tim Harder <radhermit@gentoo.org> libextractor-0.6.3-r1.ebuild:
   Remove blocker on csound (bug #247394).
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index 2acd302f1e1e..2872d853ba23 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA256
 
 DIST libextractor-0.6.3.tar.gz 1381932 SHA256 0c3afd11b77eed90d59210a947bc609b9c8adffaf656c5c665a982aa665ab5ba SHA512 0f2d5bbf6c089ae984adaae341e0c6ccf90d19dbe888edd33fdb403ad203553225ee379e80661a1e7ebde8525bb864ce88e6878d30710778f49712c4523b43c6 WHIRLPOOL e25c8cddb12c2e80127fbdfea2d2147c5226b180389666b7c4257b58d6bede6f8fcf6be75cd67c671fb87048b4f9340eefc1c40ad487b460f300af8db1cb3d52
+DIST libextractor-1.0.0.tar.gz 7893498 SHA256 bf2bc6991eb00bab8c1075814ca6e21ffc7d9403e3dc4425d380cbe39b6e0c37 SHA512 d93133b02cfae2c10533de4c74e1ce56587591bbab404bdecbf0e6df8cedc1156de5ccfdddd94be394cfeee406abfc8325fa44f4d2401b2214a86b6bdeac7b26 WHIRLPOOL f20ae87cd68649180f2917bc2679159e2115253096078e67f563a405a5d4fda7a388b75848aef24488989399e1824a81c06dabfa6862f66ae16b072c6fe6d78e
 EBUILD libextractor-0.6.3-r1.ebuild 2350 SHA256 b16db87e57c43ba6cf4efcb40595b66b708529ace3f3c27b14729d008e9e80ca SHA512 4399a166f1eea0f3e134f36da54b4e69c14758639ae916db60fe683d6395c6bdb503a3014df75833e45c94b6426109df3a78695ed64ead680551938a216c3487 WHIRLPOOL 8f0c0a94c4fda0e903251e3bb247be0075308554a9c143fad7bb25232965389f2f54018602b4a91d782cbcd4c9b88f1090529ad5e67483206dce72b641ebb364
-MISC ChangeLog 13091 SHA256 5387368f4ffdd918c0a696d15367124d1c389f28bc7ff8458e231a47ac7fb87a SHA512 ac1b5fd6b819e5992567ddbe2e49ca4166fd695c86b745585418abb6020a32321c963686243026cf6b90f5c3840fe2ae14aff90b51e82401cb0ad52bae648105 WHIRLPOOL a10f6ad7bea6769422201f04e9db4d3eb03e2c6926c097f9fc5df3c99fbdec5fe1ea3b8e5efab30c8dd25acd5c074a3b6940599767d8fe355c8e4ace83f32ed2
-MISC metadata.xml 386 SHA256 79ea7291b1d64a3683ca257d32f6816e52f30f2307b00b5680b8cc21741a96ab SHA512 6a1d2954799010c3c6cdbf9fdaf51bab7cc272655c7b95b8f8f32085f6138b909912337e3ba990e30df2247d26b4fd258df53e1c0d2c66502a28311e93c8b27a WHIRLPOOL f20278f8059bf778c20bd8d042eecd149a4ee67d58e7d9edbb7e077c08cb36b7a42e458905fc94d8b866f37e059d97383936c3d69180756f67f4cc92bdbcaeba
+EBUILD libextractor-1.0.0.ebuild 3358 SHA256 1e6667595b9fb5efbdb41bbb4d6bc609e7a49323a52fdce25ee42866e6b145da SHA512 65e44e06dfd0848bc09a156b693f1ef8e96ff13a0eaef68d6233a114cf68c6d7998408475d781c84f5b72de1f0d83801f77ecfa50f163782585e45d735b9d0a0 WHIRLPOOL eb3b3c4f63dea15c2f8d7327af801cc014ee920a4e9a2d723e653e393e9de35a802b4a497ca028701c0d17fa52f85e6308485371c6ccf0c39cde2da5c9cd2c8b
+MISC ChangeLog 13293 SHA256 66f726b9018fc34bb983e3031072f1137e883d6350c33ac55e3024859c77d0b6 SHA512 a6c3dec56d12c23adcb8bbf386552ef6c318939169804073b5409e7e5886c292f962feed3e96d06b8046b4ad9d8b83237af9ee0d8170d0290fa12f1073cb7ee6 WHIRLPOOL 2e0a4fadefa25bbe8beee5b8b2dbdcf08c64fef2675366f5161c4e2b17cc5b0ff4b4bd86d92345bb107e0d1ede2fa49424126f87281a7397226b464d58202afd
+MISC metadata.xml 646 SHA256 9518f38ad2ed27a117e60c86ed1a8036349ea35b3c476ec905501cd81d0f9ba9 SHA512 ad9e34064c90a4ac5c02d75c9cc69dd8bf7cad03fdc3f632508fb0d627e5b19e97c03849d286f1c64c1241a6c2e3ad27d07c870fd2a014a98d5e2f766d87a499 WHIRLPOOL 8057245c442abdc5a24e4265850eaf415d19abcd2d5800faedb34aaf65acba71acf3dcdc537b68766d5743ef3f2cf0254d303d7793e2ba6c337903928341101b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQVB12AAoJEEqz6FtPBkyjyEcIALoEJy56a9kT8OYxTSraIWIH
-iaI49QN3rYuLQCfR+z0CqUc+f86gw4Ydc+/2MVPJ6QIGhv3j6qtyYk4Fy9c39N9o
-k5GA2P5aK9/k0TN8EalwKCkapljlOU+NKOd79wGKxox7LNs3lxAZTViDGxqfOq+U
-VWQeiZH4vZX8cpe6T8dXKOa8giCYznvEPQ+HPS2YhuJQ19pVzqlOwv5G/9JC43/K
-HtKsnHa3BAt2ZFREUVvJQ+0SqfKGxYDgdhHs/x2RBdOxhhdPEmw0so9bHi73i0U/
-dt0GOorbDN4TCM9wDfCLcHqxiGxP69FVUyX04KpfEJdbtmZnT3liQ5AIkLw5O1M=
-=jJcR
+iQEcBAEBCAAGBQJQateHAAoJEEdUh39IaPFN3dEIAIQkbWFSao+fHv+TdIaAHTMS
+42lo2Sr7/VLk3HEH2DRAdtKy+u7kIZdWO9ECehwjduc0nluQYdLM+rx6TSqhOb0d
+0EGKNF5QPElypQBMk6I1zpR9yZAYTshPHwFuw+EsgUUOMD5v/pE0utaHP80WRahd
+8UdqJSbfo6VxE8vi5hTrQO2UwThqxPp77QgVhMP44OY3ohYhZYmCoSu/F4T7ZjhB
+ySSwptUky2QTdluuZqUcF2RPWIKh5vJ013Zg9UkKXZqNXSV2+QuanByChX1M3OLb
+y7O9tqTQ/DlodWseSL/njSPj1/Pu03WTvJoP9UU6NGUaZl8mrKkIJt+jMAVM1tg=
+=3JNs
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libextractor/libextractor-1.0.0.ebuild b/media-libs/libextractor/libextractor-1.0.0.ebuild
new file mode 100644
index 000000000000..1efc6957fa8c
--- /dev/null
+++ b/media-libs/libextractor/libextractor-1.0.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/libextractor-1.0.0.ebuild,v 1.1 2012/10/02 12:03:29 ssuominen Exp $
+
+EAPI=4
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="A library used to extract metadata from files of arbitrary type"
+HOMEPAGE="http://www.gnu.org/software/libextractor/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+archive +bzip2 ffmpeg flac gif gsf gtk jpeg mp4 +magic midi mpeg qt4 tidy tiff vorbis +zlib" # test
+
+RESTRICT="test"
+
+RDEPEND="app-text/iso-codes
+	>=dev-libs/glib-2
+	media-gfx/exiv2
+	sys-devel/libtool
+	virtual/libiconv
+	virtual/libintl
+	archive? ( app-arch/libarchive )
+	bzip2? ( app-arch/bzip2 )
+	ffmpeg? ( virtual/ffmpeg )
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+		)
+	gif? ( media-libs/giflib )
+	gsf? ( gnome-extra/libgsf )
+	gtk? ( x11-libs/gtk+:3 )
+	jpeg? ( virtual/jpeg )
+	mp4? ( media-libs/libmp4v2:0 )
+	magic? ( sys-apps/file )
+	midi? ( media-libs/libsmf )
+	mpeg? ( media-libs/libmpeg2 )
+	qt4? (
+		x11-libs/qt-gui:4
+		x11-libs/qt-svg:4
+		)
+	tidy? ( app-text/htmltidy )
+	tiff? ( media-libs/tiff:0 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		)
+	zlib? ( sys-libs/zlib )
+	!app-crypt/pkcrack
+	!sci-biology/glimmer
+	!sci-chemistry/pdb-extract"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+# test? ( app-forensics/zzuf )
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_prepare() {
+	# m4/ax_create_pkgconfig_info.m4 is passing environment LDFLAGS to Libs:
+	sed -i \
+		-e '/^ax_create_pkgconfig_ldflags=/s:$LDFLAGS ::' \
+		-e 's:ac_cv_header_tidy_tidy_h:ac_cv_header_tidy_h:g' \
+		-e 's:tidy/tidy.h:tidy.h:g' \
+		-e 's:tidy/buffio.h:buffio.h:g' \
+		configure src/plugins/html_extractor.c || die
+}
+
+src_configure() {
+	e_ac_cv() {
+		export ac_cv_"$@"
+	}
+
+	e_ac_cv {lib_rpm_rpmReadPackageFile,prog_HAVE_ZZUF}=no
+
+	if use flac; then
+		e_ac_cv header_FLAC_all_h=yes
+		e_ac_cv lib_FLAC_FLAC__stream_decoder_init_stream=yes
+	else
+		e_ac_cv header_FLAC_all_h=no
+		e_ac_cv lib_FLAC_FLAC__stream_decoder_init_stream=no
+		e_ac_cv lib_FLAC_FLAC__stream_decoder_init_ogg_stream=no
+	fi
+
+	e_ac_cv header_archive_h=$(usex archive)
+	e_ac_cv header_bzlib_h=$(usex bzip2)
+	e_ac_cv header_gif_lib_h=$(usex gif)
+	e_ac_cv header_jpeglib_h=$(usex jpeg)
+	e_ac_cv header_magic_h=$(usex magic)
+	e_ac_cv header_mpeg2dec_mpeg2_h=$(usex mpeg)
+	e_ac_cv header_tiffio_h=$(usex tiff)
+	e_ac_cv header_vorbis_vorbisfile_h=$(usex vorbis)
+	e_ac_cv header_zlib_h=$(usex zlib)
+	e_ac_cv lib_tidy_tidyInitSource=$(usex tidy)
+	e_ac_cv lib_mp4v2_MP4ReadProvider=$(usex mp4)
+	e_ac_cv lib_smf_smf_load_from_memory=$(usex midi)
+
+	local myconf
+
+	if use qt4; then
+		append-cppflags "$($(tc-getPKG_CONFIG) --cflags-only-I QtGui QtSvg)"
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-L QtGui QtSvg)"
+	else
+		myconf='--without-qt'
+	fi
+
+	# gstreamer support is for 1.0, no 0.10 support
+	econf \
+		--disable-static \
+		--enable-experimental \
+		--enable-glib \
+		$(use_enable gsf) \
+		--disable-gnome \
+		$(use_enable ffmpeg) \
+		--with-gtk_version=$(usex gtk 3.0.0 false) \
+		--without-gstreamer \
+		${myconf}
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}
diff --git a/media-libs/libextractor/metadata.xml b/media-libs/libextractor/metadata.xml
index 73fda0e4eb34..a4ea11c6c377 100644
--- a/media-libs/libextractor/metadata.xml
+++ b/media-libs/libextractor/metadata.xml
@@ -7,6 +7,9 @@
     <name>Samuli Suominen</name>
   </maintainer>
   <use>
+    <flag name='archive'>Enable archive support using <pkg>app-arch/libarchive</pkg></flag>
     <flag name='gsf'>Enable OLE2 (MS Office) plug-in support using <pkg>gnome-base/libgsf</pkg></flag>
+    <flag name='magic'>Enable magic support using <pkg>sys-apps/file</pkg></flag>
+    <flag name='midi'>Enable MIDI support through <pkg>media-libs/libsmf</pkg></flag>
   </use>
 </pkgmetadata>