From aa31619e73fc810e03ee9d28d32bdd4edc0802d4 Mon Sep 17 00:00:00 2001 From: David Guglielmi Date: Sat, 24 Oct 2015 18:09:40 +0200 Subject: [PATCH] - app-misc/qlcplus: fix qt5 deps --- app-misc/qlcplus/Manifest | 4 ++-- app-misc/qlcplus/qlcplus-4.10.1.ebuild | 13 +++++++------ app-misc/qlcplus/qlcplus-4.9.1.ebuild | 7 ++++--- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app-misc/qlcplus/Manifest b/app-misc/qlcplus/Manifest index 0fe13e1..7348854 100644 --- a/app-misc/qlcplus/Manifest +++ b/app-misc/qlcplus/Manifest @@ -2,5 +2,5 @@ AUX qlcplus-4.9.1_fix-desktop-files.patch 1363 SHA256 c34379d0f3a17224412e5ebe92 AUX qlcplus-4.9.1_remove-webaccess.patch 1779 SHA256 fad2039bcf1a4fdf438824203915af9d1cf7a429019a88721497ca091a1ce4ab SHA512 aef90c136aba67fa05e7f30cffd4b88d2b4c80bc3ddfde7a6c8070f3769ffdd1ccafd1ad8ae3a3ed71c4bf34976309d5ebd1d88658eef8c2c69dd3588b343324 WHIRLPOOL bfd2dff559d5347886e64992490536b674137b661e79a35d25fb8fbb40f9b4a0c7003526b5e0a64ca33ad8d4cbd362779dad368efb5c756d434b0048592d8a5d DIST qlcplus_4.10.1.tar.gz 9271710 SHA256 99fbd30c7476aa78234518259529cf1f1ffc5bb2f7e9f9261819c4861d75a912 SHA512 0a58835dcea0cfe289edbdb92272c4fb9d8d3c86abab7ffcd8a8a22a8757352bc1675b6125cd6dd861c03f441c6a8102869fe4c4ee9233eb8457899949c5ea32 WHIRLPOOL 1405cc9033c59f8020e901ffec1ca12f4d8886ce3f2a14b75707b0ae2337d6d2b57df1940b0e18c9bbc34932035beea8c361dc4d504e1ed4f907a37c3af77699 DIST qlcplus_4.9.1.tar.gz 9491748 SHA256 fedc9c5bc09134106f52370f8a9381455114be9e1901dc844c702e07b86ab90e SHA512 a766f0912eb497b9cd918768a477f2c84179ec003e688d94f4b47beba7b8483d05e57fd05b2e9349cf8760d8cf19bcdd2bd056c395a102d87988059a3acbe895 WHIRLPOOL fcc5d19a3d5db51abb574288dd77da2b954c2c62170104b5657cbd0d29c3db0e365c489094957dcb3008608cbb9652a6c61586570d651ded3cf54d23b152ccc3 -EBUILD qlcplus-4.10.1.ebuild 2881 SHA256 e44c5f45edc3a2db7dd59d641e0aa105f9d84b2aad7ccfa1f499434c3411de12 SHA512 ff5eadcd3188f0eef9588b8dffd5cbe050e4ec06c28e12f0d2ee3efb4990638f8f0eedc61df37324cb70b674883508f06d6d7b26744e27611f126b31bbe0e213 WHIRLPOOL ba719d8c17039e29b2008bd31140f46ff52575dd63e102e1e699552e8b3ed7a8c02ab2708790678aaec8a879324eb21595ed694401cf075e2be1db9a85e1db1d -EBUILD qlcplus-4.9.1.ebuild 2871 SHA256 6c076d5cddbf94f415e10bccc3459c136b45d4f2432272ee362d4893c9af46ac SHA512 7cccc3d3c9650612ada99aa1028dab6b0ad3f478d038d3ceb45dc81791205f4e73634d1cf1ad20dcf9b871a2e7a8a8563621289731cc684832a54c1c630ebe53 WHIRLPOOL c65428bdd4e396e02895f0f00dc99018db8d5478af3d449dbe9d6d57ef77d71075c35d921081b678e0e9f57a34f44f53928fa632cf3ad2c8b7ff09dd68d21076 +EBUILD qlcplus-4.10.1.ebuild 2886 SHA256 ff2a144e7199652b173c6a37b73d3ed3c1ceced315dfdc08b85a9248f1b7147f SHA512 0fcabcd03d6ff734b08420e312acb8fb810ee84d550599eb6866591e4a9f88074d35492aa9f5143df8bcfc3c013924da5a88a21d12c6de504fb0f47809c99585 WHIRLPOOL 2f6087dbc15780c0fd8ccf01e1ccda3e2328e8f8d3c1c884b42123793753e003f0570e4d1d8f0cae2db79df367ce54207689f0ff871b9ae3f3d2e0dab01c7b4c +EBUILD qlcplus-4.9.1.ebuild 2891 SHA256 bdc01cf29b367f80df4f59adf24e4f8cd2ab3270b4d13895e03c38f4766b198c SHA512 101082e0052fdca5dc2a73238e00e730ff3fc9df80ea7bb0af9ec586d41c10a58e0a5d1283c4591bfc922eb1f745ccdf8d41de6c01369004e693be53ccf955dd WHIRLPOOL b0f5ee10d98c4405a9e2a62040c18f675a067ffa6ce647db7abb8e193da4633e913483d0f02ff6c8a6211bfd84a7d5bb480f014099e8923ada5b7b59f8486dee diff --git a/app-misc/qlcplus/qlcplus-4.10.1.ebuild b/app-misc/qlcplus/qlcplus-4.10.1.ebuild index 287d29a..05efbb0 100644 --- a/app-misc/qlcplus/qlcplus-4.10.1.ebuild +++ b/app-misc/qlcplus/qlcplus-4.10.1.ebuild @@ -34,6 +34,7 @@ DEPEND=" >=dev-qt/qtscript-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 + >=dev-qt/linguist-tools-5.4:5 ) opendmx? ( >=dev-embedded/libftdi-0.17 @@ -56,12 +57,12 @@ src_prepare() { sed -i -e '/^unix:!macx:LIBSDIR =/s#lib#'$(get_libdir)'#1' variables.pri || die - if use qt5 ; then - export QT_SELECT=qt5 - sed -i -e '/^unix:!macx:PLUGINDIR =/s#qt4#qt5#1' variables.pri || die - else - export QT_SELECT=qt4 - fi + if use qt5 ; then + export QT_SELECT=qt5 + sed -i -e '/^unix:!macx:PLUGINDIR =/s#qt4#qt5#1' variables.pri || die + else + export QT_SELECT=qt4 + fi if ! use fixtures-editor ; then sed -i -e '/SUBDIRS += fixtureeditor/d' qlc.pro || die diff --git a/app-misc/qlcplus/qlcplus-4.9.1.ebuild b/app-misc/qlcplus/qlcplus-4.9.1.ebuild index 2d2925b..d783611 100644 --- a/app-misc/qlcplus/qlcplus-4.9.1.ebuild +++ b/app-misc/qlcplus/qlcplus-4.9.1.ebuild @@ -34,6 +34,7 @@ DEPEND=" >=dev-qt/qtscript-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 + >=dev-qt/linguist-tools-5.4:5 ) opendmx? ( >=dev-embedded/libftdi-0.17 @@ -57,9 +58,9 @@ src_prepare() { plugins/udmx/src/src.pro || die "Change udev rules path failed" sed -i -e '/^unix:!macx:LIBSDIR =/s#lib#'$(get_libdir)'#1' variables.pri || die - if use qt5 ; then - sed -i -e '/^unix:!macx:PLUGINDIR =/s#qt4#qt5#1' variables.pri || die - fi + if use qt5 ; then + sed -i -e '/^unix:!macx:PLUGINDIR =/s#qt4#qt5#1' variables.pri || die + fi if ! use fixtures-editor ; then sed -i -e '/SUBDIRS += fixtureeditor/d' qlc.pro || die