diff options
| -rw-r--r-- | app-cdr/qpxtool/ChangeLog | 10 | ||||
| -rw-r--r-- | app-cdr/qpxtool/files/qpxtool-0.7.0-ldlibs.patch | 32 | ||||
| -rw-r--r-- | app-cdr/qpxtool/files/qpxtool-0.7.0-locale-install-race-patch | 33 | ||||
| -rw-r--r-- | app-cdr/qpxtool/qpxtool-0.7.0-r1.ebuild | 41 |
4 files changed, 115 insertions, 1 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/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 +} |