From 367841647291261255386c8bcf4338bb1b8a1068 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Fri, 31 Jan 2014 19:31:47 +0000 Subject: Version bump (fixes bug #384199) (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC) --- app-cdr/qpxtool/ChangeLog | 12 +++++- .../files/qpxtool-0.7.0-locale-install-race-patch | 33 ----------------- .../files/qpxtool-0.7.0-locale-install-race.patch | 33 +++++++++++++++++ app-cdr/qpxtool/files/qpxtool-0.7.2-libs.patch | 11 ++++++ app-cdr/qpxtool/qpxtool-0.7.0-r1.ebuild | 6 +-- app-cdr/qpxtool/qpxtool-0.7.2.ebuild | 43 ++++++++++++++++++++++ 6 files changed, 100 insertions(+), 38 deletions(-) delete mode 100644 app-cdr/qpxtool/files/qpxtool-0.7.0-locale-install-race-patch create mode 100644 app-cdr/qpxtool/files/qpxtool-0.7.0-locale-install-race.patch create mode 100644 app-cdr/qpxtool/files/qpxtool-0.7.2-libs.patch create mode 100644 app-cdr/qpxtool/qpxtool-0.7.2.ebuild (limited to 'app-cdr') diff --git a/app-cdr/qpxtool/ChangeLog b/app-cdr/qpxtool/ChangeLog index 20ab4f264937..ac9c96b31f5f 100644 --- a/app-cdr/qpxtool/ChangeLog +++ b/app-cdr/qpxtool/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-cdr/qpxtool -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/qpxtool/ChangeLog,v 1.23 2013/03/02 19:13:36 hwoarang Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-cdr/qpxtool/ChangeLog,v 1.24 2014/01/31 19:31:47 polynomial-c Exp $ + +*qpxtool-0.7.2 (31 Jan 2014) + + 31 Jan 2014; Lars Wendler qpxtool-0.7.0-r1.ebuild, + +qpxtool-0.7.2.ebuild, +files/qpxtool-0.7.0-locale-install-race.patch, + -files/qpxtool-0.7.0-locale-install-race-patch, + +files/qpxtool-0.7.2-libs.patch: + Version bump (fixes bug #384199). 02 Mar 2013; Markos Chandras qpxtool-0.7.0-r1.ebuild: Move Qt dependencies to the new category 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 deleted file mode 100644 index 9192a90a7892..000000000000 --- a/app-cdr/qpxtool/files/qpxtool-0.7.0-locale-install-race-patch +++ /dev/null @@ -1,33 +0,0 @@ ---- 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/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/files/qpxtool-0.7.2-libs.patch b/app-cdr/qpxtool/files/qpxtool-0.7.2-libs.patch new file mode 100644 index 000000000000..ef46e5e6a23c --- /dev/null +++ b/app-cdr/qpxtool/files/qpxtool-0.7.2-libs.patch @@ -0,0 +1,11 @@ +--- qpxtool-0.7.2/gui/qpxtool.pro ++++ qpxtool-0.7.2/gui/qpxtool.pro +@@ -13,6 +13,8 @@ + DEPENDPATH += . include locale src + INCLUDEPATH += . include + ++LIBS+=-L../lib/lib -lqpxtransport ++ + # Input + HEADERS += include/about.h \ + include/abstractpreview.h \ diff --git a/app-cdr/qpxtool/qpxtool-0.7.0-r1.ebuild b/app-cdr/qpxtool/qpxtool-0.7.0-r1.ebuild index 43aac73ac71c..d7cb1465bdab 100644 --- a/app-cdr/qpxtool/qpxtool-0.7.0-r1.ebuild +++ b/app-cdr/qpxtool/qpxtool-0.7.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 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.3 2013/03/02 19:13:36 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/qpxtool/qpxtool-0.7.0-r1.ebuild,v 1.4 2014/01/31 19:31:47 polynomial-c Exp $ EAPI=2 inherit eutils toolchain-funcs qt4-r2 @@ -22,7 +22,7 @@ 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 + epatch "${FILESDIR}"/${P}-locale-install-race.patch epatch "${FILESDIR}"/${P}-libpng15.patch } diff --git a/app-cdr/qpxtool/qpxtool-0.7.2.ebuild b/app-cdr/qpxtool/qpxtool-0.7.2.ebuild new file mode 100644 index 000000000000..f44950f12030 --- /dev/null +++ b/app-cdr/qpxtool/qpxtool-0.7.2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-cdr/qpxtool/qpxtool-0.7.2.ebuild,v 1.1 2014/01/31 19:31:47 polynomial-c Exp $ + +EAPI=5 +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="dev-qt/qtgui:4 + dev-qt/qtsql:4 + media-libs/libpng" + +DOCS="AUTHORS ChangeLog README SupportedDevices TODO" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.7.0-locale-install-race.patch \ + "${FILESDIR}"/${PN}-0.7.0-libpng15.patch \ + "${FILESDIR}"/${PN}-0.7.2-libs.patch +} + +src_configure() { + tc-export CXX + ./configure --prefix=/usr || die + cd gui || die + mv -v Makefile{,.orig} || die "Backup Makefile for install" + qt4-r2_src_configure + #cp -v Makefile{.orig,} || die +} + +src_install() { + mv -v gui/Makefile.orig gui/Makefile || die "Restore Makefile for install" + dodir /usr/bin + dohtml status.html + qt4-r2_src_install +} -- cgit v1.2.3-65-gdbad