From: APTX Date: Sat, 31 Jan 2015 12:15:09 +0000 (+0100) Subject: Add support for building with Qt5. X-Git-Url: https://gitweb.aptx.org/?a=commitdiff_plain;h=5473df7ef5dee55827b973b9135e83cfb5f022fe;p=anidbudpclient-overlay.git Add support for building with Qt5. AniAddCLI still requires Qxt, so it can not be built with Qt5 yet. localmylist-runner requires KDE4, so it can not be built with Qt5 yet. --- diff --git a/app-anidbudpclient/aniaddcli/Manifest b/app-anidbudpclient/aniaddcli/Manifest index 119e79a..4569a8b 100644 --- a/app-anidbudpclient/aniaddcli/Manifest +++ b/app-anidbudpclient/aniaddcli/Manifest @@ -1,2 +1 @@ -EBUILD aniaddcli-9999-r2.ebuild 889 SHA256 aa60fe505fb82a73a4af6b4580720cbda89a1129149e147471ddddc8a0d0e08b SHA512 f72ae5db7f06a6888110d6f6b569f2ecc3114bf909b04a2cbf89bfffff8263b71cd1b2a10fa0771aff9715f4790652762206c9624347c0f029234e83a8719839 WHIRLPOOL 62350f58fc6e2f0dff6ed61bf2806d89d8697d252737e23fc539784730c747a07af004f022799453b0cb714df04db04e7c2a678bb9bf59cbbe28e0c8338bdcc2 -MISC metadata.xml 161 SHA256 7ef60d41d37cc5bba44b508e73f4455136aed43abe2d7fc6bbb0e15ff870f3b2 SHA512 6e27ab114b3feabc90591dba2b43bb249ddd76b78f4da3fab29919d4ae24e9011def1a7af1921fdce0689739b9046ceee55694b711ebbb7b33c1fac38f95768a WHIRLPOOL 6b943c76567016540d4b0f0acd8a3027f62dad5ca2d82640f72f4c8aad5a5b8fd986ec9873c60ef0d8f1b728ce8290558da044f1b2e23ecee8e76b35ce941dae +EBUILD aniaddcli-9999-r2.ebuild 1179 SHA256 2cd7d6fc785842a35a5954d14e1bfd96b3fb7397fd4a8c0f2233c7d331816da5 SHA512 57c1bf023d74a35dd8dd7ed51ab0621023df884af29fae6aa9e24b384356dcabbb2b2a8eaf286338172f6ee46e14144755fe1f128a38ae34ab2689e12a67db08 WHIRLPOOL 385de5db0261788beea883e27dde88b67b7fc088af7353cae3fa39f85e3b097006a701a8923e8e9bdd3ad004fa62a3d98bbaf7d4996098b210e954aa33b0003e diff --git a/app-anidbudpclient/aniaddcli/aniaddcli-9999-r2.ebuild b/app-anidbudpclient/aniaddcli/aniaddcli-9999-r2.ebuild index 27de5b9..4714c43 100755 --- a/app-anidbudpclient/aniaddcli/aniaddcli-9999-r2.ebuild +++ b/app-anidbudpclient/aniaddcli/aniaddcli-9999-r2.ebuild @@ -1,6 +1,6 @@ # ... -EAPI="3" +EAPI="5" EGIT_REPO_URI="http://aptx.org/git/AniAddCLI.git" EXPERIMENTAL="true" @@ -15,18 +15,21 @@ KEYWORDS="~amd64 ~x86" IUSE="localmylist debug" +# this still uses Qxt, which means no Qt5 version at this time +# Qt5 has its own commandline parser so it could be rewritten into a Qt5 only package +# Qxt is no longer supported by its developers. DEPEND=" - >=app-anidbudpclient/anidbudpclient-9999 - localmylist? ( app-anidbudpclient/localmylist ) + >=app-anidbudpclient/anidbudpclient-9999[qt4(+)] + localmylist? ( app-anidbudpclient/localmylist[qt4(+)] ) >=dev-qt/qtcore-4.7 >=x11-libs/libqxt-0.6.0 " RDEPEND="${DEPEND}" -S=${WORKDIR}/${PN} +S="${WORKDIR}/${PNR}" src_unpack() { - git-2_src_unpack + git-2_src_unpack } src_prepare() { @@ -38,12 +41,10 @@ src_prepare() { echo "PREFIX=/usr" >> ${S}/config.pri || die "Failed writing config.pri" + # Force C++0x + echo "QMAKE_CXXFLAGS += -std=c++0x" >> ${S}/config.pri || die "Failed writing config.pri" } src_configure() { eqmake4 -recursive } - -src_install() { - qt4-r2_src_install -} diff --git a/app-anidbudpclient/aniaddcli/metadata.xml b/app-anidbudpclient/aniaddcli/metadata.xml deleted file mode 100755 index 9fe616d..0000000 --- a/app-anidbudpclient/aniaddcli/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - no-herd - diff --git a/app-anidbudpclient/anidbudpclient/Manifest b/app-anidbudpclient/anidbudpclient/Manifest index d9af357..847b1ad 100644 --- a/app-anidbudpclient/anidbudpclient/Manifest +++ b/app-anidbudpclient/anidbudpclient/Manifest @@ -1,2 +1 @@ -EBUILD anidbudpclient-9999-r2.ebuild 1656 SHA256 8727f7f289e3f0b83d6ae881c9a988cef0784f056628640cbb9a6eca19407ab8 SHA512 39628e9aa11e3d145179e459ae15f0b3851014035ada78e575aa037f2c34d61753048d500ade72ef7cf0bda9e0e577785b53fd5b3e40bb880425f62b7ba7f3d5 WHIRLPOOL 86dd70776a602a72eaf3a309a789f1a3a96c3ed6c484e18dd95dd194b55c912568a58d6128537cf8155780eba1fa913909feb0579b32ac1ba1beaac0e49bd93f -MISC metadata.xml 161 SHA256 7ef60d41d37cc5bba44b508e73f4455136aed43abe2d7fc6bbb0e15ff870f3b2 SHA512 6e27ab114b3feabc90591dba2b43bb249ddd76b78f4da3fab29919d4ae24e9011def1a7af1921fdce0689739b9046ceee55694b711ebbb7b33c1fac38f95768a WHIRLPOOL 6b943c76567016540d4b0f0acd8a3027f62dad5ca2d82640f72f4c8aad5a5b8fd986ec9873c60ef0d8f1b728ce8290558da044f1b2e23ecee8e76b35ce941dae +EBUILD anidbudpclient-9999-r2.ebuild 1803 SHA256 29f68da27311fe40c99205651efa0a05687d69e33f71a2e5594610128e29422c SHA512 f7bcd75f5dc7aa4c1b032791a366b379fca217548f21799c7ff56fecc439739225abbb8b545b1059390111284d2c40134b281823847154f2175bdf4ccd32195f WHIRLPOOL 3862af02c2b57f19e1ad9357895244fbeed1bda411936ec8afa061afd3edd6ac84a30c32e38f2fd5d32581c29a78611ccbafe0c94cd645144893e947df512c36 diff --git a/app-anidbudpclient/anidbudpclient/anidbudpclient-9999-r2.ebuild b/app-anidbudpclient/anidbudpclient/anidbudpclient-9999-r2.ebuild index 7773c58..72c719c 100755 --- a/app-anidbudpclient/anidbudpclient/anidbudpclient-9999-r2.ebuild +++ b/app-anidbudpclient/anidbudpclient/anidbudpclient-9999-r2.ebuild @@ -1,11 +1,11 @@ # ... -EAPI="3" +EAPI="5" EGIT_REPO_URI="http://aptx.org/git/anidbudpclient.git" EXPERIMENTAL="true" -inherit git-2 qt4-r2 +inherit git-2 qmake-utils DESCRIPTION="AniDBUdpClient library" HOMEPAGE="http://aptx.org/gitweb/?p=anidbudpclient.git;a=summary" @@ -13,53 +13,61 @@ LICENSE="" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+renameparser encryption clientdebug debug" +IUSE="+renameparser encryption clientdebug +qt4 qt5 debug" +REQUIRED_USE=" + ^^ ( qt4 qt5 ) +" -# x11-libs/libqxt depends on gui/X even though it is not requird nor needed for this ebuild DEPEND=" - >=dev-qt/qtcore-4.7 - renameparser? ( >=dev-qt/qtscript-4.7 ) - encryption? ( >=app-crypt/qca-2.0.0 >=app-crypt/qca-ossl-2.0.0_beta3-r2 ) + qt4? ( + >=dev-qt/qtcore-4.7 + renameparser? ( >=dev-qt/qtscript-4.7 ) + encryption? ( >=app-crypt/qca-2.1.0.3[qt4,openssl] ) + ) + qt5? ( + >=dev-qt/qtcore-5.3 + >=dev-qt/qtnetwork-5.3 + renameparser? ( >=dev-qt/qtscript-5.3 ) + encryption? ( >=app-crypt/qca-2.1.0.3[qt5,openssl] ) + ) " RDEPEND="${DEPEND}" -S=${WORKDIR}/${PN} - -src_unpack() { - git-2_src_unpack -} +S="${WORKDIR}/${PNR}" src_prepare() { - qt4-r2_src_prepare - if ! use renameparser ; then echo "CONFIG+=norenameparser" >> ${S}/config.pri || die "Failed writing config.pri" fi - if ! use encryption ; then - echo "CONFIG+=noencrypt" >> ${S}/config.pri || die "Failed writing config.pri" - fi - - if use clientdebug ; then - echo "DEFINES+= ANIDBUDPCLIENT_CLIENT_COMMAND_DEBUG ANIDBUDPCLIENT_CLIENT_STATE_MACHINE_DEBUG" >> ${S}/config.pri || die "Failed writing config.pri" - fi + if ! use encryption ; then + echo "CONFIG+=noencrypt" >> ${S}/config.pri || die "Failed writing config.pri" + fi + if use clientdebug ; then + echo "DEFINES+= ANIDBUDPCLIENT_CLIENT_COMMAND_DEBUG ANIDBUDPCLIENT_CLIENT_STATE_MACHINE_DEBUG" >> ${S}/config.pri || die "Failed writing config.pri" + fi echo "PREFIX=/usr" >> ${S}/config.pri || die "Failed writing config.pri" - # Force C++0x - echo "QMAKE_CXXFLAGS += -std=c++0x" >> ${S}/config.pri || die "Failed writing config.pri" - + # Force C++0x + echo "QMAKE_CXXFLAGS += -std=c++0x" >> ${S}/config.pri || die "Failed writing config.pri" + # Fix convenience header paths find ${S}/include/ -type f | xargs sed -i 's,../../,,' - # Fix RenameEngine header - echo "#include \"../AniDBUdpClient/renameparser/renameengine.h\"" > ${S}/include/RenameParser/RenameEngine + # Fix RenameEngine header + echo "#include \"../AniDBUdpClient/renameparser/renameengine.h\"" > ${S}/include/RenameParser/RenameEngine } src_configure() { - eqmake4 -recursive + local eqmake="eqmake4" + if use qt5 ; then + eqmake="eqmake5" + fi + + $eqmake -recursive } src_install() { - qt4-r2_src_install + emake INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "emake install failed" } diff --git a/app-anidbudpclient/anidbudpclient/metadata.xml b/app-anidbudpclient/anidbudpclient/metadata.xml deleted file mode 100755 index 9fe616d..0000000 --- a/app-anidbudpclient/anidbudpclient/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - no-herd - diff --git a/app-anidbudpclient/localmylist-fs/Manifest b/app-anidbudpclient/localmylist-fs/Manifest index 3427293..4dd549a 100644 --- a/app-anidbudpclient/localmylist-fs/Manifest +++ b/app-anidbudpclient/localmylist-fs/Manifest @@ -1 +1 @@ -EBUILD localmylist-fs-9999.ebuild 865 SHA256 7b615d71fdb7e92134e470df1286873e39ffc24ef66150463206c384ea0711e4 SHA512 1bb67072a433817d42bd8869010ad9a2281353ba718b64e265ff50b2ecd15aec1201ce07a97ca976afdb954663b0a4b46ee447d0320cf8cae1e1b1cf1c710b5a WHIRLPOOL 04b272bec76c2345d428c6fe4e1367a2d8ddbb44c5840cf809dca6b1aeaad51bb4b668f8c5e97cd68b8de3a68df13a2b4cc286c89b57c7dd8007cab6de43d92a +EBUILD localmylist-fs-9999.ebuild 1061 SHA256 3c3fa8404de80db6b8127f71beaf1e776da532e59428a39bc9081e79e98d5f73 SHA512 5b14cfa6364bf9808f2dc73b2f230a1db37b27cef97b72530278bc4ba7a5646fd713267339ee37a11de686ecd07f4bc49a55322b11fea00fc89ec55ceb48c0bf WHIRLPOOL aef8ad4343bfb7490a5310a2372efdeeb56ec1994d4522b123f3f4561d2fe600c3839212c8c1ae0e84011c2aa91410c8c3a06148fe2a3adb1e4bbe3b2651edd4 diff --git a/app-anidbudpclient/localmylist-fs/localmylist-fs-9999.ebuild b/app-anidbudpclient/localmylist-fs/localmylist-fs-9999.ebuild index 5c7fbb1..9e3d3da 100755 --- a/app-anidbudpclient/localmylist-fs/localmylist-fs-9999.ebuild +++ b/app-anidbudpclient/localmylist-fs/localmylist-fs-9999.ebuild @@ -5,7 +5,7 @@ EAPI="5" EGIT_REPO_URI="http://aptx.org/git/localmylist-fs.git" EXPERIMENTAL="true" -inherit git-2 qt4-r2 +inherit git-2 qmake-utils DESCRIPTION="LocalMyList FUSE filesystem" HOMEPAGE="http://aptx.org/gitweb/?p=localmylist-fs.git" @@ -13,26 +13,29 @@ LICENSE="" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug" +IUSE="+qt4 qt5 debug" +REQUIRED_USE="^^ ( qt4 qt5 )" -# x11-libs/libqxt depends on gui/X even though it is not requird nor needed for this ebuild DEPEND=" - >=dev-qt/qtcore-4.7 - >=dev-qt/qtsql-4.7[postgres] - >=dev-qt/qtscript-4.7 - >=app-anidbudpclient/localmylist-9999 + qt4? ( + >=dev-qt/qtcore-4.7 + >=dev-qt/qtsql-4.7[postgres] + >=dev-qt/qtscript-4.7 + >=app-anidbudpclient/localmylist-9999[qt4(+)] + ) + qt5? ( + >=dev-qt/qtcore-5.3 + >=dev-qt/qtsql-5.3[postgres] + >=dev-qt/qtscript-5.3 + >=app-anidbudpclient/localmylist-9999[qt5(-)] + ) + sys-fs/fuse " RDEPEND="${DEPEND}" -S=${WORKDIR}/${PN} - -src_unpack() { - git-2_src_unpack -} +S="${WORKDIR}/${PNR}" src_prepare() { - qt4-r2_src_prepare - echo "PREFIX=/usr" >> ${S}/config.pri || die "Failed writing config.pri" # Force C++0x @@ -40,10 +43,14 @@ src_prepare() { } src_configure() { - eqmake4 -recursive + local eqmake="eqmake4" + if use qt5 ; then + eqmake="eqmake5" + fi + + $eqmake -recursive } src_install() { - qt4-r2_src_install + emake INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "emake install failed" } - diff --git a/app-anidbudpclient/localmylist-runner/Manifest b/app-anidbudpclient/localmylist-runner/Manifest index fe38df7..2ba5d02 100644 --- a/app-anidbudpclient/localmylist-runner/Manifest +++ b/app-anidbudpclient/localmylist-runner/Manifest @@ -1 +1 @@ -EBUILD localmylist-runner-9999.ebuild 459 SHA256 c52178f811e04c37f2815d9d6821734c8ed37a7609c7ae08937cb0b0852fe39a SHA512 942cd5658a8787c4f13589d4ccd785848182127d862a26fb4d7e2fb68a1653c58e7881a7c79fbab89600acd5690dc3dfb698857ba1fd045ffd7177c04f7d3815 WHIRLPOOL 8ed49b4e8598e9688c85e635ff3624936946e3921298bc58ee16a6e8c86a8c394aedd91438c72be19b61e69c67bb4919ca26f83b2bddf64db4d8f8305f2817c9 +EBUILD localmylist-runner-9999.ebuild 501 SHA256 b6e2f6cf0ae99297785a6021f63fd90510101a690961574fb94f040243530f9b SHA512 acf08877b9665b5989b4d800e1c05ef2f7dedde40e4083a1eb9ce224a4f26eefc3a7488adeaf499f3287426f654ed8848fd2236e29619b845e08195e379ece9d WHIRLPOOL 2c49d44923b8f1dceed918130d9a2249e38c516aab78639ac1d13a244fd15d29e3eeccd951ae9aaffb6f6faca3e227d0f556b8536fb3437ffff15fcfea217b7f diff --git a/app-anidbudpclient/localmylist-runner/localmylist-runner-9999.ebuild b/app-anidbudpclient/localmylist-runner/localmylist-runner-9999.ebuild index 73b09b7..5973696 100644 --- a/app-anidbudpclient/localmylist-runner/localmylist-runner-9999.ebuild +++ b/app-anidbudpclient/localmylist-runner/localmylist-runner-9999.ebuild @@ -14,8 +14,9 @@ KEYWORDS="~amd64 ~x86" IUSE="debug" # I don't really know if a Runner requires something beyond this +# Not sure how to do it with kde5 DEPEND=" $(add_kdebase_dep plasma-workspace) - >=app-anidbudpclient/localmylist-9999 + >=app-anidbudpclient/localmylist-9999[qt4(+)] " RDEPEND="${DEPEND}" diff --git a/app-anidbudpclient/localmylist/Manifest b/app-anidbudpclient/localmylist/Manifest index d312ea7..565baa8 100644 --- a/app-anidbudpclient/localmylist/Manifest +++ b/app-anidbudpclient/localmylist/Manifest @@ -1,3 +1,3 @@ AUX anioni.confd 112 SHA256 ec12c13370ece48b6598f1bd8aed9bdb94bde090088007c1c996cafa2f20af12 SHA512 6265d21d54710e6b7fc4bedc168524e1c2fa6238bb04c71c862ec2e462ef7b7128656854df5ffb0d69063858b27e4ef4b493485c325056352b3e7627a63bf057 WHIRLPOOL 097c634607ca1b6ddb1644e455bbcd12a18f38ef8cbe413ef86cb8732f2c570296d5d50eb2e5698aa9b02912b15aca0532d750e79c5f7b3fec68c8dd93d01202 AUX anioni.initd 1421 SHA256 1d87360f417b830ef8708b93a870b893d06eedf9e472fed31af67e15fc1578e0 SHA512 d390d044a4a0278c9eceace7997a7fa8262d8b98a5e78bed2bd5d345de8d84a297ab9a2fcebf69a2e04ae8209ee83e75e10f87f181cf05625af398f9d975c1d8 WHIRLPOOL df91d8b807543127bd73aad6f95a87cdf2b39b4ae77238f08398978efc9309a1f4e9c8cc17670e5c2065bfa4d14815d0261ae007b076ae994e6ed79ae50dba17 -EBUILD localmylist-9999.ebuild 1724 SHA256 f9271c2c95b1ba962d489d0922676b6a394c8274cad577fa466fcd69afdb06bf SHA512 a063911f3e7e3ce0ea434022329dcfad2a9891249a434ca1970feb87f4e708328f8db8e3ffe4a6c74ea113a9334aabf93fdf06e306c6ea5525a36c6ff8f99acf WHIRLPOOL 390797cdc1e294bff7fe50d8a29fae66e7c68f6b54dc379030f8079a04ffac708440b69028e502d2c92033799c4b5cbb9cedf2d8537fcbfac532eb0d6a75128c +EBUILD localmylist-9999.ebuild 1980 SHA256 40633bd50be76c228ca40ced7fd0733df6701968aeb46447c7da1115690a605a SHA512 61eb5060d1a6d5a3b75f597171221dd5d36ad6f53337384895a14e7c2fadab324a6e4d8d29e11b91657d6e48c92b45c5c67aac5f27b578d517f05e7500898ec8 WHIRLPOOL 102505ca6fc62981786b946f8c6caefdca62d421bcb4f7c047c63fab13814205f70b63f48fc28ebfd7bcb2f5ac1732bce52342c01e851df8a75bb07b4423fadb diff --git a/app-anidbudpclient/localmylist/localmylist-9999.ebuild b/app-anidbudpclient/localmylist/localmylist-9999.ebuild index 7bc906d..9ded27e 100755 --- a/app-anidbudpclient/localmylist/localmylist-9999.ebuild +++ b/app-anidbudpclient/localmylist/localmylist-9999.ebuild @@ -1,11 +1,11 @@ # ... -EAPI="3" +EAPI="5" EGIT_REPO_URI="http://aptx.org/git/localmylist.git" EXPERIMENTAL="true" -inherit git-2 qt4-r2 +inherit git-2 qmake-utils DESCRIPTION="LocalMyList library" HOMEPAGE="http://aptx.org/gitweb/?p=localmylist.git;a=summary" @@ -13,28 +13,31 @@ LICENSE="" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+anidbudpclient gui daemon tools debug" +IUSE="+anidbudpclient gui daemon tools +qt4 qt5 debug" -# x11-libs/libqxt depends on gui/X even though it is not requird nor needed for this ebuild +REQUIRED_USE="^^ ( qt4 qt5 )" DEPEND=" - >=dev-qt/qtcore-4.7 - >=dev-qt/qtsql-4.7[postgres] - >=dev-qt/qtscript-4.7 - gui? ( >=dev-qt/qtgui-4.7 ) - anidbudpclient? ( >=app-anidbudpclient/anidbudpclient-9999 ) + qt4? ( + >=dev-qt/qtcore-4.7 + >=dev-qt/qtsql-4.7[postgres] + >=dev-qt/qtscript-4.7 + gui? ( >=dev-qt/qtgui-4.7 ) + anidbudpclient? ( >=app-anidbudpclient/anidbudpclient-9999-r2[qt4] ) + ) + qt5? ( + >=dev-qt/qtcore-5.3 + >=dev-qt/qtnetwork-5.3 + >=dev-qt/qtscript-5.3 + gui? ( >=dev-qt/qtgui-5.3 >=dev-qt/qtwidgets-5.3 ) + anidbudpclient? ( >=app-anidbudpclient/anidbudpclient-9999-r2[qt5] ) + ) dev-libs/boost " RDEPEND="${DEPEND}" -S=${WORKDIR}/${PN} - -src_unpack() { - git-2_src_unpack -} +S="${WORKDIR}/${PNR}" src_prepare() { - qt4-r2_src_prepare - if ! use daemon ; then echo "CONFIG+=nodaemon" >> ${S}/config.pri || die "Failed writing config.pri" fi @@ -62,12 +65,18 @@ src_prepare() { find ${S}/localmylist/include/ -type f | xargs sed -i 's,../../,,' } + src_configure() { - eqmake4 -recursive + local eqmake="eqmake4" + if use qt5 ; then + eqmake="eqmake5" + fi + + $eqmake -recursive } src_install() { - qt4-r2_src_install + emake INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "emake install failed" if use daemon ; then newinitd "${FILESDIR}"/anioni.initd anioni