diff options
| -rw-r--r-- | app-office/lyx/Manifest | 2 | ||||
| -rw-r--r-- | app-office/lyx/lyx-2.2.0.ebuild | 27 |
2 files changed, 21 insertions, 8 deletions
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest index 964c2c5..dcd630b 100644 --- a/app-office/lyx/Manifest +++ b/app-office/lyx/Manifest @@ -8,7 +8,7 @@ DIST lyx-2.2.0alpha2.tar.xz 14713760 SHA256 91c6baf19b7bb6b79bb88a36c299e02774a8 DIST lyx-2.2.0beta2.tar.xz 20161532 SHA256 367c703c7119e18c8a67af6fae7415fb0bd48ce1219e99e2bd022f33c560634f SHA512 fd749d1d585ce551459a360029910aa27f7f925ca94b78fdd9f26dd3d5e90cb6db518da8c54cd5e76c0423f71adab5b6bc5b05d0668d6405345b9eff45fc7e13 WHIRLPOOL a2a771fd53ad5f9e654a6020af2cdf8a69c0e557534dd752544e0de566af2137418444f5bb83c2df43f4839a24c3e3dc7edbda668ed68f800ce780862c433901 DIST lyx-2.2.0rc1.tar.xz 20140824 SHA256 1007abdd58d89c0dbc60fe0b24b02348f6fd7d0cce728eb4c69b9e227af402c7 SHA512 6cacce530b18f8e9c154c0b29a6a37c5eed6980a661e7788f6ae2ec3c58c93e0b24292fd2877a561ff0bf01fe8798479c7397e6b83589eb915debb423318984a WHIRLPOOL 7743c160d33dfdb89f12635a1d36a2d4765c1b1cf3fe2a3f69a9888d4a0f22cacd2809ce34d3b2d6f7477007fdb55ff492b8fdb0af8bd06bd4497298439b07e3 EBUILD lyx-2.0.9999.ebuild 4404 SHA256 787050b72267184788961c5c1eac32ebe264b07fca60d9b8c898cc8a2f169e61 SHA512 4b27205b213f4323216ca3d699dba400d2344bf1900d2394828532bc0abd6531abaf14b2d8de3100566f4e133a949e2ac6c046f166dad39fa17d2e4e0966e6a7 WHIRLPOOL ba3bc068f9b3370f7dbe3c5795713e1a5fc2d2d9956dc778cae4417f7a2783b55de5531414329e765fd9dc08429843f535ea07d6288c2acb703b6538511d0143 -EBUILD lyx-2.2.0.ebuild 4318 SHA256 75edf89698d61a432e59a58a0946c915ce067b84f750abd688aa8702ccc48ad1 SHA512 cf92cf3db764bf0e302eddbfda367658933acfc838862bc83f3d12b2bd1df2a0091be71c07378ae385ace08e9f91aa4f6b1e682eef7efd566c1f889de2f469c4 WHIRLPOOL fcdfbeb645ad9e0c5237c10c06c6a567226dbc5d23e69b7674e9f357bc5e5ac1146976c988de73d80286c74823ebe494767c84d2c7754f20d35cf882ed7b39b9 +EBUILD lyx-2.2.0.ebuild 4661 SHA256 aefc593f789ce95e9b07ac41f6f36df640c3f50798506f0d451382b661f20e44 SHA512 0d77a423ed4f0e90da36de89be7bd8a0b4edd15f697561a0e3a8727d4a83b5eafddeaf3008dd617e6bb39b685fe6250161380cf38e30b35534b451958b260439 WHIRLPOOL 79060fb6914168ce494661f2bb9b3fbfd552a54a62f1989d8060f753b8b0a34b140f100a57328e5b3e966d6cc6e59e57dbcfb4a808213ef264e16961391ef1f7 EBUILD lyx-2.2.0_alpha2.ebuild 4293 SHA256 035b3f76010b4aebaff86e857edb3ea2900c5cfd0347a1c08029945e43a9ce8d SHA512 6731f90231278a2b7ccd0b00fd12274f4ee659c3be09813e7c28eb8d049d1ccdb2323d1ec45ac61b650caaf05bea4edd68fcd0c364ce201d6e0c680cf0102f04 WHIRLPOOL 39e6bdc97293ca6dea87067d10ff857e82380143cacf5241246e9c2ea1bf2b8c6c8484bfd1f330855bc572ac13c782eb0fa4ccaef2be7e1c9cc392259844db19 EBUILD lyx-2.2.0_beta2.ebuild 4293 SHA256 035b3f76010b4aebaff86e857edb3ea2900c5cfd0347a1c08029945e43a9ce8d SHA512 6731f90231278a2b7ccd0b00fd12274f4ee659c3be09813e7c28eb8d049d1ccdb2323d1ec45ac61b650caaf05bea4edd68fcd0c364ce201d6e0c680cf0102f04 WHIRLPOOL 39e6bdc97293ca6dea87067d10ff857e82380143cacf5241246e9c2ea1bf2b8c6c8484bfd1f330855bc572ac13c782eb0fa4ccaef2be7e1c9cc392259844db19 EBUILD lyx-2.2.0_rc1.ebuild 4293 SHA256 035b3f76010b4aebaff86e857edb3ea2900c5cfd0347a1c08029945e43a9ce8d SHA512 6731f90231278a2b7ccd0b00fd12274f4ee659c3be09813e7c28eb8d049d1ccdb2323d1ec45ac61b650caaf05bea4edd68fcd0c364ce201d6e0c680cf0102f04 WHIRLPOOL 39e6bdc97293ca6dea87067d10ff857e82380143cacf5241246e9c2ea1bf2b8c6c8484bfd1f330855bc572ac13c782eb0fa4ccaef2be7e1c9cc392259844db19 diff --git a/app-office/lyx/lyx-2.2.0.ebuild b/app-office/lyx/lyx-2.2.0.ebuild index 57d32cf..cc45bee 100644 --- a/app-office/lyx/lyx-2.2.0.ebuild +++ b/app-office/lyx/lyx-2.2.0.ebuild @@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos" -IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant" +IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant +qt4 qt5" LANGS="ar ca cs da de el en es eu fi fr gl he hu ia id it ja nb nn pl pt_BR pt_PT ro ru sk sr sv tr uk zh_CN zh_TW" @@ -28,15 +28,16 @@ for X in ${LANGS}; do IUSE="${IUSE} linguas_${X}" done -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + qt4? ( !qt5 ) + qt5? ( !qt4 )" DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING ) -COMMONDEPEND="dev-qt/qtgui:4 - dev-qt/qtcore:4 - dev-qt/qtsvg:4 - >=dev-libs/boost-1.34:= - ${PYTHON_DEPS}" +COMMONDEPEND=">=dev-libs/boost-1.34:= + ${PYTHON_DEPS} + qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 dev-qt/qtsvg:4 ) + qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtsvg:5 )" RDEPEND="${COMMONDEPEND} dev-texlive/texlive-fontsextra @@ -94,12 +95,23 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/2.1-python.patch sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die + if use qt4; then + export QT_SELECT=qt4 + elif use qt5; then + export QT_SELECT=qt5 + fi } src_configure() { tc-export CXX #bug 221921 export VARTEXFONTS=${T}/fonts + local qt_flag="" + if use qt4; then + qt_flag="" + elif use qt5; then + qt_flag="--enable-qt5" + fi econf \ $(use_enable nls) \ @@ -108,6 +120,7 @@ src_configure() { $(use_with hunspell) \ $(use_with aspell) \ $(use_with enchant) \ + ${qt_flag} \ --without-included-boost \ --disable-stdlib-debug \ --with-packaging=posix |