From 7ed6b42adb46d6e23c9e523d49d4ed0b4bc04aaf Mon Sep 17 00:00:00 2001 From: "E. Liddell" Date: Sat, 21 Nov 2020 01:28:00 +0100 Subject: 14.0.8 ebuilds for tdebase, tdeartwork, tdeutils, and their dependencies (also 14.0.7 ebuild for kworldclock), and removal of obsolete 14.0.6 ebuilds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also removed all references to ispell (no longer in main portage tree, aspell provides same functionality) and streamlined spelling flags in general. Signed-off-by: E. Liddell Signed-off-by: Slávek Banko --- dev-tqt/tqt/Manifest | 1 + dev-tqt/tqt/tqt-14.0.6.ebuild | 291 ------------------------ dev-tqt/tqt/tqt-14.0.8.ebuild | 290 +++++++++++++++++++++++ dev-tqt/tqtinterface/Manifest | 1 + dev-tqt/tqtinterface/tqtinterface-14.0.6.ebuild | 33 --- dev-tqt/tqtinterface/tqtinterface-14.0.8.ebuild | 34 +++ 6 files changed, 326 insertions(+), 324 deletions(-) delete mode 100644 dev-tqt/tqt/tqt-14.0.6.ebuild create mode 100644 dev-tqt/tqt/tqt-14.0.8.ebuild delete mode 100644 dev-tqt/tqtinterface/tqtinterface-14.0.6.ebuild create mode 100644 dev-tqt/tqtinterface/tqtinterface-14.0.8.ebuild (limited to 'dev-tqt') diff --git a/dev-tqt/tqt/Manifest b/dev-tqt/tqt/Manifest index 00e7949b..4afc41f7 100644 --- a/dev-tqt/tqt/Manifest +++ b/dev-tqt/tqt/Manifest @@ -1,2 +1,3 @@ DIST tqt3-trinity-14.0.6.tar.xz 10959204 BLAKE2B 916f1cc43e453a1aa2f97f1f6a8f61b0a76b0976739894ad162ef3a8842192cc4abdd5687390468df37f918791c515b6de62d118093887495d4aeb60d72f931b SHA512 d65f50746cbffaccbc52f869a9fd05edd690ffb5335fe4d461bc25404e341b7252866b8fff5d12b40f523bdbec1f8d4ef77d243e60aa02b906260f32e8e2809d DIST tqt3-trinity-14.0.7.tar.xz 10989944 BLAKE2B 81969bfe0dbd841e43cf523782d03bb45747b2579e268645d61b0ab06ba83be21fdf3a661c3c6a3dfdd603628e28f9a36a61def9087269a7b0537688cd1f4b6a SHA512 6be61e29c8e3a085b2e2bab75c1c981bcd411b7f5505c5ff8024b2166a9996c04524dd3b740a0b6ca6a0c27e9ae33e86d7566faaed65b05d92656642a18de465 +DIST tqt3-trinity-14.0.8.tar.xz 10963556 BLAKE2B f19f549e9d604261fe48a0eab50fb376f7d401faafdb4b1d63ebacdf07c1f9d52c756b83c3213ae1e719020919d0cba514ef4194d96d9c0be56883f48d16b145 SHA512 a3ab80895d27a9097bc2077fef606701241b125a5664906f40863ae5bf73e27c359fe318c81f022f20a08652c7a7ffc2601742642a89385f9a146f09a18835a9 diff --git a/dev-tqt/tqt/tqt-14.0.6.ebuild b/dev-tqt/tqt/tqt-14.0.6.ebuild deleted file mode 100644 index cc959fd5..00000000 --- a/dev-tqt/tqt/tqt-14.0.6.ebuild +++ /dev/null @@ -1,291 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Copyright 2020 The Trinity Desktop Project -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit eutils toolchain-funcs - -# Don't use Gentoo mirrors -RESTRICT="mirror" - -SRCTYPE="free" -DESCRIPTION="Trinity's Qt3 fork - a comprehensive C++ application development framework" -HOMEPAGE="https://trinitydesktop.org/" - -SRC_URI="http://www.mirrorservice.org/sites/trinitydesktop.org/trinity/releases/R${PV}/main/dependencies/tqt3-trinity-${PV}.tar.xz" -LICENSE="|| ( GPL-2 GPL-3 )" - -SLOT="3.5" -IUSE="cups debug doc examples firebird ipv6 mysql nas nis +opengl postgres styles - imext sqlite +xinerama tablet +xrandr glib mng fontconfig +hiddenvisibility" - -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - virtual/jpeg:= - media-libs/freetype - media-libs/libpng:= - sys-libs/zlib - x11-libs/libXft - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libXmu - x11-libs/libICE - x11-libs/libXext - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXrandr - x11-libs/libSM - cups? ( net-print/cups ) - firebird? ( dev-db/firebird ) - mysql? ( virtual/mysql ) - nas? ( media-libs/nas ) - nis? ( net-libs/libnsl ) - opengl? ( virtual/opengl virtual/glu ) - postgres? ( dev-db/postgresql:= ) - sqlite? ( dev-db/sqlite:= ) - mng? ( media-libs/libmng ) - glib? ( dev-libs/glib ) - fontconfig? ( media-libs/fontconfig ) - xinerama? ( x11-libs/libXinerama ) - xrandr? ( x11-libs/libXrandr )" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -TQTBASE="/usr/tqt3" - -S="${WORKDIR}/tqt3-trinity-${PV}" - -pkg_setup() { - if use imext; then - ewarn - ewarn "You are going to compile binary incompatible immodule for TQt. This means" - ewarn "you have to recompile everything depending on TQt after you install it." - ewarn "Be aware." - ewarn - ewarn "You can do that with: revdep-rebuild --library 'libtqt-mt.so.3'" - ewarn "To use that command, you need to install app-portage/gentoolkit." - ewarn - fi - - export QTDIR="${S}" - - CXX=$(tc-getCXX) - if [[ ${CXX/g++/} != ${CXX} ]]; then - PLATCXX="g++" - elif [[ ${CXX/icpc/} != ${CXX} ]]; then - PLATCXX="icc" - else - die "Unknown compiler ${CXX}." - fi - - case ${CHOST} in - *-freebsd*|*-dragonfly*) - PLATNAME="freebsd" ;; - *-openbsd*) - PLATNAME="openbsd" ;; - *-netbsd*) - PLATNAME="netbsd" ;; - *-darwin*) - PLATNAME="darwin" ;; - *-linux-*|*-linux) - PLATNAME="linux" ;; - *) - die "Unknown CHOST, no platform chosen." - esac - - if [[ "$CHOST" == *64* && "$PLATCXX" == "g++" ]]; then - export PLATFORM="${PLATNAME}-${PLATCXX}-64" - else - export PLATFORM="${PLATNAME}-${PLATCXX}" - fi -} - -src_prepare() { - # Apply user-provided patches - eapply_user - - # Do not link with -rpath. See Gentoo bug #75181. - find "${S}"/mkspecs -name qmake.conf | xargs \ - sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:' || die - - # Make qmake.conf respect our flags and toolchain - sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ - -e 's:QMAKE_CFLAGS\t\t=.*:QMAKE_CFLAGS =:' \ - -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ - -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ - -e "s:\.*=.*:QMAKE_CC=$(tc-getCC):" \ - -e "s:\.*=.*:QMAKE_CXX=$(tc-getCXX):" \ - -e "s:\.*=.*:QMAKE_LINK=$(tc-getCXX):" \ - -e "s:\.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \ - -e "s:\.*=.*:QMAKE_STRIP=:" \ - "${S}/mkspecs/${PLATFORM}/qmake.conf" || die - - # Remove obsolete X11 and OpenGL searchpaths - find "${S}"/mkspecs -name qmake.conf | xargs \ - sed -i -e 's:QMAKE_INCDIR_X11\t=.*:QMAKE_INCDIR_X11\t=:' \ - -e 's:QMAKE_LIBDIR_X11\t=.*:QMAKE_LIBDIR_X11\t=:' \ - -e 's:QMAKE_INCDIR_OPENGL\t=.*:QMAKE_INCDIR_OPENGL\t=:' \ - -e 's:QMAKE_LIBDIR_OPENGL\t=.*:QMAKE_LIBDIR_OPENGL\t=:' || die - - if use hiddenvisibility; then - sed -i -e 's:QMAKE_CFLAGS =:QMAKE_CFLAGS = -fvisibility=hidden -fvisibility-inlines-hidden:' \ - "${S}/mkspecs/${PLATFORM}/qmake.conf" || die - fi - - if [ $(get_libdir) != "lib" ] ; then - sed -i -e "s:/lib$:/$(get_libdir):" \ - "${S}/mkspecs/${PLATFORM}/qmake.conf" || die - sed -i -e "s:/usr/lib /lib:/usr/$(get_libdir) /$(get_libdir):" \ - "${S}/config.tests/unix/"*.test || die - sed -i -e "s:/usr/lib /lib:/usr/$(get_libdir) /$(get_libdir):" \ - "${S}/config.tests/x11/"*.test || die - sed -i -e "s:/lib /usr/lib:/$(get_libdir) /usr/$(get_libdir):" \ - "${S}/config.tests/unix/checkavail" || die - fi - - sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ - -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ - "${S}/qmake/Makefile.unix" || die - - # Remove docs from install if we don't need them - use doc || sed -i -e '/INSTALLS.*=.*htmldocs/d' \ - "${S}/src/qt_install.pri" || die -} - -src_configure() { - export SYSCONF="${D}${TQTBASE}"/etc/settings - - # Let's just allow writing to these directories - # during emerge as it makes TQt much happier. - addwrite "${TQTBASE}/etc/settings" - addwrite "${HOME}/.qt" - - # Common options - myconf=" -sm -thread -stl -no-verbose -largefile -no-pch -inputmethod -qt-style-motif" - myconf+=" $(echo -{qt-imgfmt-,system-lib}{jpeg,png}) -qt-gif -system-zlib" - myconf+=" -platform ${PLATFORM} -xplatform ${PLATFORM}" - myconf+=" -xft -xrender -xshape -xkb -xcursor -prefix ${TQTBASE}" - myconf+=" -libdir ${TQTBASE}/$(get_libdir) -fast -no-sql-odbc" - - [ "$(get_libdir)" != "lib" ] && myconf+="${myconf} -L/usr/$(get_libdir)" - - # Optional options - use cups && myconf+=" -cups" || myconf+=" -no-cups" - use debug && myconf+=" -debug" || myconf+=" -release -no-g++-exceptions -no-exceptions" - use firebird && myconf+=" -plugin-sql-ibase -I/opt/firebird/include" || myconf+=" -no-sql-ibase" - use fontconfig && myconf+=" -lfontconfig" - use glib && myconf+=" -glibmainloop" || myconf+=" -no-glibmainloop" - use imext && myconf+=" -inputmethod-ext" || myconf+=" -no-inputmethod-ext" - use ipv6 && myconf+=" -ipv6" || myconf+=" -no-ipv6" - use mng && myconf+=" -qt-imgfmt-mng -system-libmng" || myconf+=" -no-imgfmt-mng" - use mysql && myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf+=" -no-sql-mysql" - use nas && myconf+=" -system-nas-sound" || myconf+=" -no-nas-sound" - use nis && myconf+=" -nis" || myconf+=" -no-nis" - use opengl && myconf+=" -enable-module=opengl -no-dlopen-opengl" || myconf+=" -disable-opengl" - use postgres && myconf+=" -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf+=" -no-sql-psql" - # Don't build styles, except requested (Motif is mandatory for TDE) - use styles && myconf+=" -plugin-style-cde -plugin-style-compact -plugin-style-motifplus -plugin-style-platinum -plugin-style-sgi -plugin-style-windows" || myconf+=" -no-style-cde -no-style-compact -no-style-motifplus -no-style-platinum -no-style-sgi -no-style-windows" - use sqlite && myconf+=" -plugin-sql-sqlite -plugin-sql-sqlite3" || myconf+=" -no-sql-sqlite -no-sql-sqlite3" - use tablet && myconf+=" -tablet" || myconf+=" -no-tablet" - use xinerama && myconf+=" -xinerama" || myconf+=" -no-xinerama" - use xrandr && myconf+=" -xrandr" || myconf+=" -no-xrandr" - - export YACC='byacc -d' - tc-export CC CXX - export LINK="$(tc-getCXX)" - - einfo ./configure ${myconf} - ./configure ${myconf} || die -} - -src_compile() { - # Compile TQt with TQmake and TQmoc - emake src-qmake src-moc sub-src - - # Compile TQt plugins (if any selected) - emake sub-plugins - - # Point to libs for the tools to build fine too - export DYLD_LIBRARY_PATH="${S}/lib:${DYLD_LIBRARY_PATH}" - export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" - - # Compile TQDesigner (TQuic is needed by tdelibs), TQAssistant and friends (msg2tqm, qembed..) - emake sub-tools - - # Compile examples and tutorials - if use examples; then - emake sub-tutorial sub-examples - fi -} - -src_install() { - # Install TQt with all compiled before - emake INSTALL_ROOT="${D}" install - - # Fix qmake.conf files - find "${D}${TQTBASE}/mkspecs" -name qmake.conf | xargs \ - sed -i -e "s:\$(QTDIR):${TQTBASE}:" || die - - # Fix pkgconfig location - dodir /usr/$(get_libdir) - mv "${D}${TQTBASE}/$(get_libdir)/pkgconfig" "${D}/usr/$(get_libdir)/" - - # List all the multilib libdirs - local libdirs - for alibdir in $(get_all_libdirs); do - libdirs="${libdirs}:${TQTBASE}/${alibdir}" - done - - # Set environment variables - cat < "${T}"/44tqt3 -PATH=${TQTBASE}/bin -ROOTPATH=${TQTBASE}/bin -LDPATH=${libdirs:1} -MANPATH=${TQTBASE}/doc/man -EOF - - cat < "${T}"/44-tqt3-revdep -SEARCH_DIRS="${TQTBASE}" -EOF - - insinto /etc/revdep-rebuild - doins "${T}"/44-tqt3-revdep - doenvd "${T}"/44tqt3 - - if [ "${SYMLINK_LIB}" = "yes" ]; then - dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${TQTBASE}/lib - fi - - keepdir ${TQTBASE}/etc/settings - - if use doc; then - insinto ${TQTBASE} - doins -r "${S}"/doc - fi - - # Install example and tutorial sources - if use examples; then - find "${S}"/examples "${S}"/tutorial -name Makefile | \ - xargs sed -i -e "s:${S}:${TQTBASE}:g" - - cp -r "${S}"/examples "${D}"${TQTBASE}/ - cp -r "${S}"/tutorial "${D}"${TQTBASE}/ - fi - - # Misc build requirements - sed -e "s:${S}:${TQTBASE}:g" \ - "${S}"/.qmake.cache > "${D}"${TQTBASE}/.qmake.cache -} - -pkg_postinst() { - echo - elog "After rebuilding TQt, it can happen that TQt plugins (such as TQt/TDE styles," - elog "or widgets for the TQt designer) are no longer recognized. If this situation" - elog "occurs you should recompile the packages providing these plugins," - elog "and you should also make sure that TQt and its plugins were compiled with the" - elog "same version of GCC. Packages that may need to be rebuilt are, for instance," - elog "trinity-base/tdelibs and trinity-base/tdeartwork-styles." - echo -} diff --git a/dev-tqt/tqt/tqt-14.0.8.ebuild b/dev-tqt/tqt/tqt-14.0.8.ebuild new file mode 100644 index 00000000..ed5d2a74 --- /dev/null +++ b/dev-tqt/tqt/tqt-14.0.8.ebuild @@ -0,0 +1,290 @@ +# Copyright 1999-2020 Gentoo Authors +# Copyright 2020 The Trinity Desktop Project +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit eutils toolchain-funcs + +# Don't use Gentoo mirrors +RESTRICT="mirror" + +SRCTYPE="free" +DESCRIPTION="Trinity's Qt3 fork - a comprehensive C++ application development framework" +HOMEPAGE="https://trinitydesktop.org/" + +SRC_URI="http://www.mirrorservice.org/sites/trinitydesktop.org/trinity/releases/R${PV}/main/dependencies/tqt3-trinity-${PV}.tar.xz" +LICENSE="|| ( GPL-2 GPL-3 )" +KEYWORDS="~amd64 ~x86" + +SLOT="3.5" +IUSE="cups debug doc examples firebird ipv6 mysql nas nis +opengl postgres styles + imext sqlite +xinerama tablet +xrandr glib mng fontconfig +hiddenvisibility" + +RDEPEND=" + virtual/jpeg:= + media-libs/freetype + media-libs/libpng:= + sys-libs/zlib + x11-libs/libXft + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXmu + x11-libs/libICE + x11-libs/libXext + x11-libs/libXt + x11-libs/libX11 + x11-libs/libXrandr + x11-libs/libSM + cups? ( net-print/cups ) + firebird? ( dev-db/firebird ) + mysql? ( virtual/mysql ) + nas? ( media-libs/nas ) + nis? ( net-libs/libnsl ) + opengl? ( virtual/opengl virtual/glu ) + postgres? ( dev-db/postgresql:= ) + sqlite? ( dev-db/sqlite:= ) + mng? ( media-libs/libmng ) + glib? ( dev-libs/glib ) + fontconfig? ( media-libs/fontconfig ) + xinerama? ( x11-libs/libXinerama ) + xrandr? ( x11-libs/libXrandr )" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +TQTBASE="/usr/tqt3" + +S="${WORKDIR}/tqt3-trinity-${PV}" + +pkg_setup() { + if use imext; then + ewarn + ewarn "You are going to compile binary incompatible immodule for TQt. This means" + ewarn "you have to recompile everything depending on TQt after you install it." + ewarn "Be aware." + ewarn + ewarn "You can do that with: revdep-rebuild --library 'libtqt-mt.so.3'" + ewarn "To use that command, you need to install app-portage/gentoolkit." + ewarn + fi + + export QTDIR="${S}" + + CXX=$(tc-getCXX) + if [[ ${CXX/g++/} != ${CXX} ]]; then + PLATCXX="g++" + elif [[ ${CXX/icpc/} != ${CXX} ]]; then + PLATCXX="icc" + else + die "Unknown compiler ${CXX}." + fi + + case ${CHOST} in + *-freebsd*|*-dragonfly*) + PLATNAME="freebsd" ;; + *-openbsd*) + PLATNAME="openbsd" ;; + *-netbsd*) + PLATNAME="netbsd" ;; + *-darwin*) + PLATNAME="darwin" ;; + *-linux-*|*-linux) + PLATNAME="linux" ;; + *) + die "Unknown CHOST, no platform chosen." + esac + + if [[ "$CHOST" == *64* && "$PLATCXX" == "g++" ]]; then + export PLATFORM="${PLATNAME}-${PLATCXX}-64" + else + export PLATFORM="${PLATNAME}-${PLATCXX}" + fi +} + +src_prepare() { + # Apply user-provided patches + eapply_user + + # Do not link with -rpath. See Gentoo bug #75181. + find "${S}"/mkspecs -name qmake.conf | xargs \ + sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:' || die + + # Make qmake.conf respect our flags and toolchain + sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ + -e 's:QMAKE_CFLAGS\t\t=.*:QMAKE_CFLAGS =:' \ + -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ + -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ + -e "s:\.*=.*:QMAKE_CC=$(tc-getCC):" \ + -e "s:\.*=.*:QMAKE_CXX=$(tc-getCXX):" \ + -e "s:\.*=.*:QMAKE_LINK=$(tc-getCXX):" \ + -e "s:\.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \ + -e "s:\.*=.*:QMAKE_STRIP=:" \ + "${S}/mkspecs/${PLATFORM}/qmake.conf" || die + + # Remove obsolete X11 and OpenGL searchpaths + find "${S}"/mkspecs -name qmake.conf | xargs \ + sed -i -e 's:QMAKE_INCDIR_X11\t=.*:QMAKE_INCDIR_X11\t=:' \ + -e 's:QMAKE_LIBDIR_X11\t=.*:QMAKE_LIBDIR_X11\t=:' \ + -e 's:QMAKE_INCDIR_OPENGL\t=.*:QMAKE_INCDIR_OPENGL\t=:' \ + -e 's:QMAKE_LIBDIR_OPENGL\t=.*:QMAKE_LIBDIR_OPENGL\t=:' || die + + if use hiddenvisibility; then + sed -i -e 's:QMAKE_CFLAGS =:QMAKE_CFLAGS = -fvisibility=hidden -fvisibility-inlines-hidden:' \ + "${S}/mkspecs/${PLATFORM}/qmake.conf" || die + fi + + if [ $(get_libdir) != "lib" ] ; then + sed -i -e "s:/lib$:/$(get_libdir):" \ + "${S}/mkspecs/${PLATFORM}/qmake.conf" || die + sed -i -e "s:/usr/lib /lib:/usr/$(get_libdir) /$(get_libdir):" \ + "${S}/config.tests/unix/"*.test || die + sed -i -e "s:/usr/lib /lib:/usr/$(get_libdir) /$(get_libdir):" \ + "${S}/config.tests/x11/"*.test || die + sed -i -e "s:/lib /usr/lib:/$(get_libdir) /usr/$(get_libdir):" \ + "${S}/config.tests/unix/checkavail" || die + fi + + sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ + -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ + "${S}/qmake/Makefile.unix" || die + + # Remove docs from install if we don't need them + use doc || sed -i -e '/INSTALLS.*=.*htmldocs/d' \ + "${S}/src/qt_install.pri" || die +} + +src_configure() { + export SYSCONF="${D}${TQTBASE}"/etc/settings + + # Let's just allow writing to these directories + # during emerge as it makes TQt much happier. + addwrite "${TQTBASE}/etc/settings" + addwrite "${HOME}/.qt" + + # Common options + myconf=" -sm -thread -stl -no-verbose -largefile -no-pch -inputmethod -qt-style-motif" + myconf+=" $(echo -{qt-imgfmt-,system-lib}{jpeg,png}) -qt-gif -system-zlib" + myconf+=" -platform ${PLATFORM} -xplatform ${PLATFORM}" + myconf+=" -xft -xrender -xshape -xkb -xcursor -prefix ${TQTBASE}" + myconf+=" -libdir ${TQTBASE}/$(get_libdir) -fast -no-sql-odbc" + + [ "$(get_libdir)" != "lib" ] && myconf+="${myconf} -L/usr/$(get_libdir)" + + # Optional options + use cups && myconf+=" -cups" || myconf+=" -no-cups" + use debug && myconf+=" -debug" || myconf+=" -release -no-g++-exceptions -no-exceptions" + use firebird && myconf+=" -plugin-sql-ibase -I/opt/firebird/include" || myconf+=" -no-sql-ibase" + use fontconfig && myconf+=" -lfontconfig" + use glib && myconf+=" -glibmainloop" || myconf+=" -no-glibmainloop" + use imext && myconf+=" -inputmethod-ext" || myconf+=" -no-inputmethod-ext" + use ipv6 && myconf+=" -ipv6" || myconf+=" -no-ipv6" + use mng && myconf+=" -qt-imgfmt-mng -system-libmng" || myconf+=" -no-imgfmt-mng" + use mysql && myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf+=" -no-sql-mysql" + use nas && myconf+=" -system-nas-sound" || myconf+=" -no-nas-sound" + use nis && myconf+=" -nis" || myconf+=" -no-nis" + use opengl && myconf+=" -enable-module=opengl -no-dlopen-opengl" || myconf+=" -disable-opengl" + use postgres && myconf+=" -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf+=" -no-sql-psql" + # Don't build styles, except requested (Motif is mandatory for TDE) + use styles && myconf+=" -plugin-style-cde -plugin-style-compact -plugin-style-motifplus -plugin-style-platinum -plugin-style-sgi -plugin-style-windows" || myconf+=" -no-style-cde -no-style-compact -no-style-motifplus -no-style-platinum -no-style-sgi -no-style-windows" + use sqlite && myconf+=" -plugin-sql-sqlite -plugin-sql-sqlite3" || myconf+=" -no-sql-sqlite -no-sql-sqlite3" + use tablet && myconf+=" -tablet" || myconf+=" -no-tablet" + use xinerama && myconf+=" -xinerama" || myconf+=" -no-xinerama" + use xrandr && myconf+=" -xrandr" || myconf+=" -no-xrandr" + + export YACC='byacc -d' + tc-export CC CXX + export LINK="$(tc-getCXX)" + + einfo ./configure ${myconf} + ./configure ${myconf} || die +} + +src_compile() { + # Compile TQt with TQmake and TQmoc + emake src-qmake src-moc sub-src + + # Compile TQt plugins (if any selected) + emake sub-plugins + + # Point to libs for the tools to build fine too + export DYLD_LIBRARY_PATH="${S}/lib:${DYLD_LIBRARY_PATH}" + export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" + + # Compile TQDesigner (TQuic is needed by tdelibs), TQAssistant and friends (msg2tqm, qembed..) + emake sub-tools + + # Compile examples and tutorials + if use examples; then + emake sub-tutorial sub-examples + fi +} + +src_install() { + # Install TQt with all compiled before + emake INSTALL_ROOT="${D}" install + + # Fix qmake.conf files + find "${D}${TQTBASE}/mkspecs" -name qmake.conf | xargs \ + sed -i -e "s:\$(QTDIR):${TQTBASE}:" || die + + # Fix pkgconfig location + dodir /usr/$(get_libdir) + mv "${D}${TQTBASE}/$(get_libdir)/pkgconfig" "${D}/usr/$(get_libdir)/" + + # List all the multilib libdirs + local libdirs + for alibdir in $(get_all_libdirs); do + libdirs="${libdirs}:${TQTBASE}/${alibdir}" + done + + # Set environment variables + cat < "${T}"/44tqt3 +PATH=${TQTBASE}/bin +ROOTPATH=${TQTBASE}/bin +LDPATH=${libdirs:1} +MANPATH=${TQTBASE}/doc/man +EOF + + cat < "${T}"/44-tqt3-revdep +SEARCH_DIRS="${TQTBASE}" +EOF + + insinto /etc/revdep-rebuild + doins "${T}"/44-tqt3-revdep + doenvd "${T}"/44tqt3 + + if [ "${SYMLINK_LIB}" = "yes" ]; then + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${TQTBASE}/lib + fi + + keepdir ${TQTBASE}/etc/settings + + if use doc; then + insinto ${TQTBASE} + doins -r "${S}"/doc + fi + + # Install example and tutorial sources + if use examples; then + find "${S}"/examples "${S}"/tutorial -name Makefile | \ + xargs sed -i -e "s:${S}:${TQTBASE}:g" + + cp -r "${S}"/examples "${D}"${TQTBASE}/ + cp -r "${S}"/tutorial "${D}"${TQTBASE}/ + fi + + # Misc build requirements + sed -e "s:${S}:${TQTBASE}:g" \ + "${S}"/.qmake.cache > "${D}"${TQTBASE}/.qmake.cache +} + +pkg_postinst() { + echo + elog "After rebuilding TQt, it can happen that TQt plugins (such as TQt/TDE styles," + elog "or widgets for the TQt designer) are no longer recognized. If this situation" + elog "occurs you should recompile the packages providing these plugins," + elog "and you should also make sure that TQt and its plugins were compiled with the" + elog "same version of GCC. Packages that may need to be rebuilt are, for instance," + elog "trinity-base/tdelibs and trinity-base/tdeartwork-styles." + echo +} diff --git a/dev-tqt/tqtinterface/Manifest b/dev-tqt/tqtinterface/Manifest index 2c02d0ff..3d74fca2 100644 --- a/dev-tqt/tqtinterface/Manifest +++ b/dev-tqt/tqtinterface/Manifest @@ -1,2 +1,3 @@ DIST tqtinterface-trinity-14.0.6.tar.xz 820244 BLAKE2B a7a47146cdcc2801f5715a99d564da0b53e90a1a7e03fc405bc52dfd62fae9ec04a631f43aad48fdfa60dd740ec53cc0d0c62d27c89799322d226d3ffb613148 SHA512 4df4fb6fdfd26ef75dca197fc4cd5ef373c72da19259580ce06b5e1f6d2f816f8763fc0c9f6293fa58157c333ee40bacc599ba8977ca9b1c9bb7d2ce61fe54c7 DIST tqtinterface-trinity-14.0.7.tar.xz 597088 BLAKE2B a7cdbfb5230585415ce4baa63c3b441d75cfcbb0d365dd3d1cdaedccef51c5d97de2b9ee36f57c5f3384d6320addbdd5e18f926a5e431ae1fb1a44720091c957 SHA512 59017920d434f7c79bd062c0fc2f42f0d60144bcbd66ad046ea3b55ed3ea9406dc286922e1292c7e4d0e52b3c20b6d5776af136411bd01b3b6de556a2814d6b6 +DIST tqtinterface-trinity-14.0.8.tar.xz 593896 BLAKE2B 8a971afd5a6941970dc7af23a5017c9f82986741a5b12ecd164d49915bed05e7be6c021c7aa494dcdafc2791eadbea839667b83cbca2a433e537a5f086dae2c8 SHA512 d54beb281ad1342789a126bc0aefd91f71e15e63e35c1b1f8c03bdd3f527952b8d886b192fd36248b7610d9c12d3922faa6e930061d7bdf95e283fdb3b9febea diff --git a/dev-tqt/tqtinterface/tqtinterface-14.0.6.ebuild b/dev-tqt/tqtinterface/tqtinterface-14.0.6.ebuild deleted file mode 100644 index 3000ba83..00000000 --- a/dev-tqt/tqtinterface/tqtinterface-14.0.6.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Copyright 2020 The Trinity Desktop Project -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -TRINITY_MODULE_TYPE="dependencies" -TRINITY_MODULE_NAME="tqtinterface" -inherit trinity-base-2 - -DESCRIPTION="Interface and abstraction library for TQt and Trinity" -HOMEPAGE="https://trinitydesktop.org/" - -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="~dev-tqt/tqt-${PV} - virtual/glu" -RDEPEND="${DEPEND}" - -pkg_setup() { - export QTDIR="/usr/tqt3" -} - -src_configure() { - local mycmakeargs=( - -DUSE_QT3=ON - -DQT_PREFIX_DIR="${QTDIR}" - ) - - cmake-utils_src_configure -} diff --git a/dev-tqt/tqtinterface/tqtinterface-14.0.8.ebuild b/dev-tqt/tqtinterface/tqtinterface-14.0.8.ebuild new file mode 100644 index 00000000..3a154b17 --- /dev/null +++ b/dev-tqt/tqtinterface/tqtinterface-14.0.8.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2020 Gentoo Authors +# Copyright 2020 The Trinity Desktop Project +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +TRINITY_MODULE_TYPE="dependencies" +TRINITY_MODULE_NAME="tqtinterface" +inherit trinity-base-2 + +DESCRIPTION="Interface and abstraction library for TQt and Trinity" +HOMEPAGE="https://trinitydesktop.org/" +LICENSE="|| ( GPL-2 GPL-3 )" +KEYWORDS="~amd64 ~x86" +SLOT="0" + +IUSE="+opengl" + +DEPEND="~dev-tqt/tqt-${PV}[opengl=] + opengl? ( virtual/glu )" +RDEPEND="${DEPEND}" + +pkg_setup() { + export QTDIR="/usr/tqt3" +} + +src_configure() { + local mycmakeargs=( + -DUSE_QT3=ON + -DQT_PREFIX_DIR="${QTDIR}" + ) + + cmake-utils_src_configure +} -- cgit v1.2.1