Fix a parallel build issue, bug #298662, a parallel install issue and build with --as-needed.

Package-Manager: portage-2.2_rc61/cvs/Linux i686

5 files changed, 119 insertions, 2 deletions

diff --git a/app-cdr/qpxtool/ChangeLog b/app-cdr/qpxtool/ChangeLog
index 0b33ec1118ee..d1ab870e2adb 100644
--- a/app-cdr/qpxtool/ChangeLog
+++ b/app-cdr/qpxtool/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-cdr/qpxtool
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/qpxtool/ChangeLog,v 1.20 2010/01/07 08:56:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/qpxtool/ChangeLog,v 1.21 2010/01/25 20:08:33 carlo Exp $
+
+*qpxtool-0.7.0-r1 (25 Jan 2010)
+
+  25 Jan 2010; Carsten Lohrke <carlo@gentoo.org> +qpxtool-0.7.0-r1.ebuild,
+  +files/qpxtool-0.7.0-ldlibs.patch,
+  +files/qpxtool-0.7.0-locale-install-race-patch:
+   Fix a parallel build issue, bug #298662, a parallel install issue and
+  build with --as-needed.
 
   07 Jan 2010; <hwoarang@gentoo.org> qpxtool-0.7.0.ebuild:
   migrated to qt4-r2 eclass
diff --git a/app-cdr/qpxtool/Manifest b/app-cdr/qpxtool/Manifest
index 439d59605db8..2562379854c3 100644
--- a/app-cdr/qpxtool/Manifest
+++ b/app-cdr/qpxtool/Manifest
@@ -1,8 +1,11 @@
+AUX qpxtool-0.7.0-ldlibs.patch 1319 RMD160 92cf9725ebadab570623069298373b85e29b23f2 SHA1 fd845dc9c06fa4a34e1eba193b5e4c5ec466f7c2 SHA256 86403bee16f4387893cc4c80d748977e69ce743da477c63fe58a6158809c05ef
+AUX qpxtool-0.7.0-locale-install-race-patch 1003 RMD160 9878b28548e80f2cf61f98dd5697ab555954f9af SHA1 32a0bf1e6ecc093c4eb7faa903d97208c1109552 SHA256 35b625380ac55771b37cd770895f65c4c0ee8666eb2be57b4ac2c72ff77f6282
 AUX qpxtool-0.7.0-lrelease.patch 409 RMD160 9829ac03b770313c724625d1d66d8705ec1e3dbf SHA1 c036fffca12d48eb462170ddab0d4767cd00ea42 SHA256 7f0a171f6a94b0924a8495daed75a9803afa1eafdc3f20c0186cbd75a250ca96
 AUX qpxtool-0.7.0_pre4-dl.patch 347 RMD160 ad181f956f4b1404f346c90eac69554f903161ae SHA1 b09f58920f50cda0ef197ada668d0f52cbf78dc5 SHA256 cf75ed9e91575df4d8181f5a764de354f745c60ed7d53a88093b07445cbed584
 DIST qpxtool-0.7.0.tar.bz2 482918 RMD160 e2919beff1ade5c49d19c6e04cd4b17e7c7df7d5 SHA1 6e58bc7da5556e138ebf48758cbdbfd718f5ab7e SHA256 e5abf00c032e14a5b0cbc2359b4bc69833faf9c976273809904a0644ec5dfdbd
 DIST qpxtool-0.7.0pre4.tar.bz2 455248 RMD160 f7661ecea220c40931dc39f6de888d2e0d869e45 SHA1 b5c654547cce479e517716d70fe8feec9f086930 SHA256 055af196c55313ae30c36029db87d995efdbcbe541b2035eb49bd49f8dfaa666
+EBUILD qpxtool-0.7.0-r1.ebuild 1037 RMD160 021918154689d5fa7d12da6aa2ab649e0b34684b SHA1 74a413c8219fb5dc3a77c8e1b1be2e8636860c6f SHA256 172af1d40a798a8e3db166b016eafc75bce5835fbac845ece37b738610bb53cc
 EBUILD qpxtool-0.7.0.ebuild 971 RMD160 3da9877e0f37dd6da010326d714f7868a98f3ba4 SHA1 674e3c9c75d987f0ac86ac95f6e0cd5159a52018 SHA256 68284e638548b49f6f6372d8bd4a3dd85f6003d193306a4d1f11fd77193c4b3a
 EBUILD qpxtool-0.7.0_pre4.ebuild 1018 RMD160 356b7853738ed1c1fd46514e565174a1d4de5f17 SHA1 20c62d61f1dee0bae9246034e823d8b16fc89253 SHA256 0cba2bb735841c0bf018e864e2d6a91d82cf6f62fe56cf440b99336d60fcede7
-MISC ChangeLog 2923 RMD160 713f79260fbe5a75e563b3ad987a3ff03feb0e52 SHA1 6b39f0db3fc0a75926213069918a1e7d34e080cd SHA256 a7ceed080da381ce5ba3d6014e00c508fb9a44d8e7d9a3fe0d9048e1241b467d
+MISC ChangeLog 3215 RMD160 01d27167d817cc12896f45741ad503ccc22c4ebe SHA1 69a964c6da611a913f46cf3245d85c80d351e865 SHA256 94e87fa5dd39a1ed8d266f696e8c8aeb05bd4b7aeca7b6531cc7629c900efa4f
 MISC metadata.xml 166 RMD160 02ca0a5d9279c1b52c3887f5a1f52f3feb002af9 SHA1 b9fccc7c24aa717c30efef068fd544a692f264f6 SHA256 ce62d1e5b04e01d03a732ee6d33b3d500810de8e55af4a527c970e5b475735d8
diff --git a/app-cdr/qpxtool/files/qpxtool-0.7.0-ldlibs.patch b/app-cdr/qpxtool/files/qpxtool-0.7.0-ldlibs.patch
new file mode 100644
index 000000000000..3f7b35b43879
--- /dev/null
+++ b/app-cdr/qpxtool/files/qpxtool-0.7.0-ldlibs.patch
@@ -0,0 +1,32 @@
+--- qpxtool-0.7.0.old/console/f1tattoo/Makefile	2010-01-09 12:05:18.000000000 +0100
++++ qpxtool-0.7.0/console/f1tattoo/Makefile	2010-01-09 12:21:39.000000000 +0100
+@@ -5,7 +5,7 @@
+ 
+ CXXFLAGS += -I. -I../../lib/include $(LPNG_INC)
+ CFLAGS   += -I. -I../../lib/include $(LPNG_INC)
+-LDLIBS   += -lqpxtransport -lqpxyamaha $(LPNG_LIB) -L../../lib/lib
++LDLIBS   += -lqpxtransport -lqpxyamaha -L../../lib/lib $(LPNG_LIB)
+ 
+ $(BIN): $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(LDLIBS)
+--- qpxtool-0.7.0/console/qscan/Makefile.orig	2010-01-23 19:37:37.201487022 +0100
++++ qpxtool-0.7.0/console/qscan/Makefile	2010-01-23 19:44:07.915487435 +0100
+@@ -5,7 +5,7 @@
+ 
+ CXXFLAGS += -I. -I../../lib/include
+ CFLAGS   += -I. -I../../lib/include
+-LDLIBS   += -lqpxtransport -lqpxscan -lqpxplextor -L../../lib/lib $(LIBS_DL)
++LDLIBS   += -lqpxtransport -lqpxscan -lqpxplextor -L../../lib/lib
+ 
+ $(BIN): $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(LDLIBS)
+--- qpxtool-0.7.0/lib/qpxscan/Makefile.orig	2010-01-25 18:27:39.373641192 +0100
++++ qpxtool-0.7.0/lib/qpxscan/Makefile	2010-01-25 18:18:03.420641552 +0100
+@@ -12,6 +12,6 @@
+ VER_MINOR  = 7
+ VER_MICRO  = 0
+ 
+-LDLIBS += -lqpxtransport -lqpxplextor -L../lib $(LIBS_INET)
++LDLIBS += $(LIBS_DL) -lqpxtransport -lqpxplextor -L../lib $(LIBS_INET)
+ 
+ include ../Makefile.lib
diff --git a/app-cdr/qpxtool/files/qpxtool-0.7.0-locale-install-race-patch b/app-cdr/qpxtool/files/qpxtool-0.7.0-locale-install-race-patch
new file mode 100644
index 000000000000..9192a90a7892
--- /dev/null
+++ b/app-cdr/qpxtool/files/qpxtool-0.7.0-locale-install-race-patch
@@ -0,0 +1,33 @@
+--- qpxtool-0.7.0/gui/updateqm.pri.orig	2010-01-25 19:44:45.061640334 +0100
++++ qpxtool-0.7.0/gui/updateqm.pri	2010-01-25 19:40:03.711640850 +0100
+@@ -0,0 +1,19 @@
++isEmpty(QMAKE_LRELEASE) {
++
++    win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
++
++    else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
++
++}
++
++updateqm.input = TRANSLATIONS
++
++updateqm.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.qm
++
++updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.qm
++
++updateqm.CONFIG += no_link
++
++QMAKE_EXTRA_COMPILERS += updateqm
++
++PRE_TARGETDEPS += compiler_updateqm_make_all
+--- qpxtool-0.7.0/gui/qpxtool.pro.orig	2010-01-25 19:46:45.011641756 +0100
++++ qpxtool-0.7.0/gui/qpxtool.pro	2010-01-25 19:47:08.397640627 +0100
+@@ -2,6 +2,8 @@
+ # Automatically generated by qmake (2.01a) ?? ???. 24 12:26:02 2009
+ ######################################################################
+ 
++include( updateqm.pri )
++
+ MOC_DIR=moc
+ OBJECTS_DIR=obj
+ QT+=network
diff --git a/app-cdr/qpxtool/qpxtool-0.7.0-r1.ebuild b/app-cdr/qpxtool/qpxtool-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..4be5a5274a38
--- /dev/null
+++ b/app-cdr/qpxtool/qpxtool-0.7.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/qpxtool/qpxtool-0.7.0-r1.ebuild,v 1.1 2010/01/25 20:08:33 carlo Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs qt4-r2
+
+DESCRIPTION="CD/DVD quality checking utilities"
+HOMEPAGE="http://qpxtool.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/qt-gui:4
+	media-libs/libpng"
+
+DOCS="AUTHORS ChangeLog README ReleaseNotes TODO"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-lrelease.patch
+	epatch "${FILESDIR}"/${P}-ldlibs.patch
+	epatch "${FILESDIR}"/${P}-locale-install-race-patch
+}
+
+src_configure() {
+	tc-export CXX
+	./configure --prefix=/usr || die
+	cd gui
+	mv -vf Makefile Makefile.orig || die "Backup Makefile for install"
+	qt4-r2_src_configure
+}
+
+src_install() {
+	mv -vf gui/Makefile.orig gui/Makefile || die "Restore Makefile for install"
+	dodir /usr/bin
+	dohtml status.html
+	qt4-r2_src_install
+}