Respect LDFLAGS. #435050. Respect AR and call eqmake4 instead of qmake. Bug #435052

Package-Manager: portage-2.1.11.30/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4AFF2C2

3 files changed, 181 insertions, 15 deletions

diff --git a/app-misc/recoll/ChangeLog b/app-misc/recoll/ChangeLog
index 9a6410cc4741..52d6a6b536f0 100644
--- a/app-misc/recoll/ChangeLog
+++ b/app-misc/recoll/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/recoll
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/ChangeLog,v 1.10 2012/09/08 09:32:47 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/ChangeLog,v 1.11 2012/10/30 22:35:43 hwoarang Exp $
+
+*recoll-1.17.3-r1 (30 Oct 2012)
+
+  30 Oct 2012; Markos Chandras <hwoarang@gentoo.org> +recoll-1.17.3-r1.ebuild:
+  Respect LDFLAGS. #435050. Respect AR and call eqmake4 instead of qmake. Bug
+  #435052
 
   08 Sep 2012; Markos Chandras <hwoarang@gentoo.org> recoll-1.17.3.ebuild:
   Restrict python to version 2. Bug #425492
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index a59e43e8e614..90166969e66e 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -4,23 +4,24 @@ Hash: SHA256
 DIST recoll-1.16.2.tar.gz 1422148 SHA256 f0f29dff2d82ef8541c51963870f31daf28472f3c8822c81c17c346769b77355 SHA512 c71458bd1a42ef118560e516f30787b8c9dbc8b2841e667b77e420b0866c8308f8509e46be9eaa731348438d4194d1954bf369ea68e23eca5a65ac516806c609 WHIRLPOOL 320afbd8598aae44827eff09dfa936090fe1c4bf34e5d10f4115a211267e8f7f09b4e530e8915c75252dee3bda3c4955979a19075e14da4d99f27ee1bf00df92
 DIST recoll-1.17.3.tar.gz 1757278 SHA256 7778f80546e6b10ca45bfb7f8bb0876ccf3987dd4e98c5003ff923bd8b5acb1c SHA512 b41d28255e6bfbfc8e0025d88c3d56ecfbd35814bfa359c41f3e5d3cc25debe6d66dc617aa4c012e1911aa8c373c48a1661f7fff926e2cce423562af82c2fb31 WHIRLPOOL 3ba9d58a0df401832b1a97f34f4caec1b79aa7de027b936b05195d447e374097bff9205714b1a97c287610c74c0ec2e7e726b144c2295859c293a013c3564644
 EBUILD recoll-1.16.2.ebuild 4012 SHA256 e6e944516222018253a5f6e1a358e236193b6556f40b337d6c2f32d0c882ddbe SHA512 9c508416e9515caa3e4f57839dbf406deee0453295b4f91b2979b2782142b01881a8e7f55d5c11bfa35703a6fd918c3b33992582f115690f1e26edc3d6fc1527 WHIRLPOOL e9b9afc74c2fe323b4a6ad9b05136a62af62b3ef696a9d25684b52b25f510067b2605c44fd6415cadf58521565ec84a9bc9776985fe246798d5af72529740e6e
+EBUILD recoll-1.17.3-r1.ebuild 4305 SHA256 d3ef90937181386bb592d6b3f244c54d4b685c26ac47ea288ff5f03dddc87a4b SHA512 f7ca0feab05435f2e339ad7b236c5e6776728e6018c678aa373b759560dd4f8447be5caf0bcb0ad019a71366ef0637d347c3e6e5ee84b131fa46ad4dafdf7eca WHIRLPOOL 4bff30cce78ffc508fd3679fbaff024e28e0f4c9ddd98a1705091e0e75eb58667777d2cf5f6fed6582ca8c901a2caad10c9f7072e40417d06a883cf6de4bc8c4
 EBUILD recoll-1.17.3.ebuild 4113 SHA256 3af0155e892f525266276acfe92450681c82690c34dda70db1dc51f750b19023 SHA512 ffd547b09712b3636347b3890fe91afa75f33e5c3c000d7414e25f2831c97b8c53036b0e29bfc9405fb4dfffed3cc446c0673c3958c40babbe25a29d76f37936 WHIRLPOOL dc54e395d6e9f59f36a1df47618da0a0c1f17e5cb31ffd6564f695e57d398d6d8ae396561102dbbce14ccfc3296846b753f50d864d5fe6255b2585f36b500953
-MISC ChangeLog 1870 SHA256 347ff307918a3ab1dc4e76675462ab97e90b7a6ed9d78af22ece2e6e46d72a65 SHA512 60c820328b6bfffd30f9a435f378392aa1738bab209c1036f48d538f991c256039f233d85275d55e63637649182716260c5682507e38e2c509feb45369560f93 WHIRLPOOL dd165becf5ed343a625df68e92a72458aee891e5f60c9328f5a6996200bf5a1db7d65b234479969307be0be40b2028c04b2130ca69df3787c8ce26f6d28d51c9
+MISC ChangeLog 2071 SHA256 f9df8f794134e4a9871c16f7ee39709e1224559a5b2a40473e179708208090a9 SHA512 8dbbf50e4ad42ac3bcf4f1da58f6fb58647279126e58ebd3dad2b549950b800e90377f0dd71f56ab54338fab1e38c942f1cced136d6ce196ec668cec4305f038 WHIRLPOOL 49a02389335f998889c9279d11de2b6ba33ec0cb00794c03abd3283159ed8e0572289021c708be7f84d5a018739e8a17458976d4085bc45797899778c690c2fe
 MISC metadata.xml 1367 SHA256 3375e9e74dd52ce92023e548c072128aa561977395717a6d2dc6b25972154bc9 SHA512 7b4b5da5d425300c79701e57d420940850fcc0628af9827004afa2a379ab176bafe2cd9d1e0aa4ecf2e2b8ba7eebe4a596bc2fcbedec96f7fbfb6ffa37a4ff03 WHIRLPOOL b1ac460ca62f8e46503a37d32c3f81fdda359662a5bc3c2176551c9b2b26b20f8708d76596b71e3a8ec82ae3be6a0b521702bbe84aab4782838657fe4355e833
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQSxDEAAoJEPqDWhW0r/LCmRwQALsZRBjQeN6mgKEOfWwhj79k
-AVbkhNcnj2u9MD9SKeEckdSVTxsF1Vvc63XGntfLCmUTZ/0/TfxIPCa+eogsbICA
-Lq+StA0KLLvawrfXV4R9PXlCqaCZfnbNpt98N3nl8F6OqBdEt1NRWwd2PYyJ0E4T
-UPszlhAeP2nwfswgla3EzmQQo6+a1Atoz3UEJqDpQT7m2oXKtP2st7X4MbgLBfH3
-iLBeLlw787fHBMWsjd2eev3SeiHU5gZZGD5S7ChAD2oWGP5oaAFZtWsJYzPYxRAz
-PZQnH4UjEL4SGNru2VGSwTjJOTcxaw5JshJeXOuisIxtfWEH4Injw49vGYOxjDVF
-DLHf2kjs7z/kUUBtzpNkYi+HXdCHMgwn3s0dP4B2hv2QH25K+RqDYldAgkE+zlTz
-AmnfV/1bA6/ewmcpD2UC/h95whA2VU9083l1m7XOBIwsudCLOr4MT4zsDRtkPacL
-jObADWJpAz02YK8Ed/9MlfD4i31+DVkeCXy5kY8IsUBZUlVTjri75tqQibwFjxaR
-BQNH8N9PEqAnXCG6LMRbI366Hfzvk9P5wBoBifHAFIwz4qs/YG8waGXUVKeKCzzX
-OnTRS8o0rL55W6Xv0ggYWdQBL1QagrytOKVYafmmKphO7jf2gzSPHvWx6RnjBm4W
-yGSPDb44DiKIXkqthblV
-=/G2d
+iQIcBAEBCAAGBQJQkFY/AAoJEPqDWhW0r/LCQYgQAIC8FaYkkfqb6mqPax7RQZYc
+fRJMQK/buuGH4Bwz6GVqszCnzvTj4jQYKRbc2t+vdBcCK+znua0Y8k/zvzH92tIo
+r50Z0NCRgqZwOXfIYqsjwlpvyQHX5aAD82ZqwbsNFajYHjgmUfXtJodrtsgptPN8
+Shf1OOh/5mSUNNm/+6K7oAHeXN4+ddu7JV10MhnkagfvqdEXerNomMxpvXwJxj4m
+faJ4sMjEWpiGrAuLsktptFXXmePNoLu4e7gzUcaQzVWQoA8yZ4Z3VSsIZDrizyrk
+YA7u7/JJSMReEFtGUNU1fQ1J9hrRqqlyBkZQgOR3Dg03Q5HqrFT8xp8hQv9RPqeP
+UmrU7DeABr34Kd3RW2jmQrDtZKAp6car8wxupYoK0OEcMb+F7NKBuWFE7PgQrARd
+frcYvM1mftWcYK4TStnR8E7/h2iTUMpbi1AClxRChgqaT7Hhp6wqCESgJ1K5fiL7
+X/k1w1WGQ5FG2sMIoqcIAEM0tbEdYyBgq4IwUvRqUo4rBZAMOhLqCISxlKy8hOCF
+vLuFYB96Hm7XjxlhEr2WxEwXF8eOzhsIbH/irEA7T8NqblyE23jyTmIh9trlGxoQ
+gJGd3S4h/CCP4Ed8XoLPohTwRUDLfw+ExZMFGhvoLM+1M5nH2z03T5/cBI5966D7
+KoYXv39r+egenhllFCQS
+=gfHN
 -----END PGP SIGNATURE-----
diff --git a/app-misc/recoll/recoll-1.17.3-r1.ebuild b/app-misc/recoll/recoll-1.17.3-r1.ebuild
new file mode 100644
index 000000000000..9dcf05bfb43a
--- /dev/null
+++ b/app-misc/recoll/recoll-1.17.3-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/recoll-1.17.3-r1.ebuild,v 1.1 2012/10/30 22:35:43 hwoarang Exp $
+
+EAPI="4"
+
+PYTHON_DEPEND="2"
+inherit toolchain-funcs qt4-r2 linux-info python
+
+DESCRIPTION="A personal full text search package"
+HOMEPAGE="http://www.lesbonscomptes.com/recoll/"
+SRC_URI="http://www.lesbonscomptes.com/recoll/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+INDEX_HELPERS="audio chm djvu dvi exif postscript ics info lyx msdoc msppt msxls pdf rtf tex wordperfect xml"
+IUSE="+spell +inotify +qt4 +session camelcase xattr fam ${INDEX_HELPERS}"
+
+DEPEND="
+	virtual/libiconv
+	>=dev-libs/xapian-1.0.12
+	sys-libs/zlib
+	spell? ( app-text/aspell )
+	!inotify? ( fam? ( virtual/fam ) )
+	qt4? (
+		x11-libs/qt-core:4[qt3support]
+		x11-libs/qt-webkit:4
+		)
+	session? (
+		inotify? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE )
+		!inotify? ( fam? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) )
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+	app-arch/unzip
+	sys-apps/sed
+	|| ( sys-apps/gawk sys-apps/mawk )
+	pdf? ( app-text/poppler )
+	postscript? ( app-text/pstotext )
+	msdoc? ( app-text/antiword )
+	msxls? ( app-text/catdoc )
+	msppt? ( app-text/catdoc )
+	wordperfect? ( app-text/libwpd:0.9 )
+	rtf? ( app-text/unrtf )
+	tex? ( dev-tex/detex )
+	dvi? ( virtual/tex-base )
+	djvu? ( >=app-text/djvu-3.5.15 )
+	exif? ( media-libs/exiftool )
+	chm? ( dev-python/pychm )
+	ics? ( dev-python/icalendar )
+	lyx? ( app-office/lyx )
+	audio? ( media-libs/mutagen )
+	xml? ( dev-libs/libxslt )
+	info? ( sys-apps/texinfo )
+	"
+
+REQUIRED_USE="^^ ( fam inotify ) session? ( || ( fam inotify ) )"
+
+pkg_pretend() {
+	if use inotify; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+
+	local i at_least_one_helper
+
+	at_least_one_helper=0
+	for i in $INDEX_HELPERS; do
+		if use $i; then
+			at_least_one_helper=1
+			break
+		fi
+	done
+	if [[ $at_least_one_helper -eq 0 ]]; then
+		ewarn
+		ewarn "You did not enable any of the optional file format flags."
+		ewarn "Recoll can read some file formats natively, but many of them"
+		ewarn "are optional since they require external helpers."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# remember configure.ac is b0rked. Fix it before using eautoreconf in the
+	# future
+	# eautoreconf
+
+	# do not strip binaries
+	sed -i -e "/STRIP/d" "${S}"/${PN}install.in \
+		|| die "Failed to fix the installation script"
+	# Drop all the QMAKE lines. We will do it ourselves
+	sed -i -e "/QMAKE/d" Makefile.in || die
+}
+
+src_configure() {
+	local qtconf
+
+	use qt4 && qtconf="QMAKEPATH=/usr/bin/qmake"
+
+	econf \
+		$(use_with spell aspell) \
+		$(use_enable xattr) \
+		$(use_with inotify) \
+		$(use_enable qt4 qtgui) \
+		$(use_enable camelcase) \
+		$(use_with fam) \
+		$(use_with inotify) \
+		$(use_enable session x11mon) \
+		${qtconf}
+	cd qtgui && eqmake4 ${PN}.pro && cd ..
+}
+
+src_compile() {
+	# Do not let upstream people decide on our behalf
+	sed -i "s:ar ru:$(tc-getAR) ru:" lib/Makefile || die
+
+	emake \
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		CFLAGS="${CFLAGS} ${LDFLAGS}" \
+		CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	# You probably wonder why I did not fix recollinstall in src_prepare.
+	# --prefix requires an absolute path but recollinstall requires prefix
+	# to be actually 'usr' because double // makes portage sad. And no, I am not
+	# gonna ask upstream to fix the build system
+	sed -i -e "/PREFIX/s:/usr:usr:" "${S}"/${PN}install || die
+	sed -i -e "/prefix/s:/usr:usr:" "${S}"/Makefile || die
+
+	emake DESTDIR="${D%/}" install
+	dodoc ChangeLog README
+	mv "${D}/usr/share/${PN}/doc" "${D}/usr/share/doc/${PF}/html"
+	dosym /usr/share/doc/${PF}/html /usr/share/${PN}/doc
+}
+
+pkg_postinst() {
+	elog
+	elog "Default configuration files located at"
+	elog "/usr/share/${PN}/examples. Either edit these files to match"
+	elog "your needs or copy them to ~/.recoll/ and edit these files"
+	elog "instead."
+	elog
+	if use xattr; then
+		elog "Use flag \"xattr\" enables support for fetching field values"
+		elog "from extended file attributes. You will also need to set up a"
+		elog "map from the attributes names to the Recoll field names"
+		elog "(see comment at the end of the fields configuration file."
+	fi
+}