diff --git a/net-im/mirage/Manifest b/net-im/mirage/Manifest index 5c41c1f..4988a5c 100644 --- a/net-im/mirage/Manifest +++ b/net-im/mirage/Manifest @@ -1,4 +1,2 @@ DIST hsluv-c-9e9be32d6010cad484a7b12b1a3d19c6cf4c1353.tar.gz 1073542 BLAKE2B d798c71be3d3f7ad4248650f08bbb477b43b27edafa8519ddb9ac2873a1da99767f6f6668280fc9fa8abce7ab8347a9fe040a9b80c189f4e13465b5747e07adc SHA512 ecd8c9afa9e22c6a0093435ce89b5d5b1882207359d02a65f6e62952fa4b57fc5b3e1aaa07527553a7e86c350173409b21d41b3da5235a7fb5f96b61944be839 -DIST mirage-v0.6.4.tar.gz 3130527 BLAKE2B eec48e6afc0e0cc609b0ebad2799c2e9defea564a271251e98c41ca2176e1c98bd3c228f4bcfb5719e993b5c71ed964e61939eaf0f4f104315fda79cc80d3db3 SHA512 1780e5e9da7a31b2310d3e07d6b52a7be8cfe97262fef34ef470fd3d92621e554596858168d1d555d7dcf6f506853e0260b744a7725e70c9a34cf399be2394e0 -DIST mirage-v0.7.0.tar.gz 3286989 BLAKE2B ca9fbcf922816d7d78364886b3f05456a77aa2a19b2fc22807a3e02da53ff33ca8805a3c6ed4645a3e31a8057600f50dae188eab2d63402466b0022031555201 SHA512 1dae541344b092b60069e9b629a0177bae65ecc6264708d0dfdaa85bf26dabf7ad855fdca833d4e2622a6dc59f8291f3359c24a98d443461b5aa0e2db9f35e09 DIST mirage-v0.7.1.tar.gz 3287140 BLAKE2B 9b31c9754a9f7ee7ab79d004e3f923ed027ad6f7c28f088a76b89708b067fd4fa08d6042ebb4ca3807ede2df3fbf80cb3f93354714839b5e3f82c47e07993985 SHA512 af4e6adb33e4fad200947d91592b76115be426c8d5a780bed0cffbbea72189bd513815c2c2aa74ae6e06c6b35e17a2fc47b4350cc57fe27c35f972753b5bb772 diff --git a/net-im/mirage/mirage-0.6.4.ebuild b/net-im/mirage/mirage-0.6.4.ebuild deleted file mode 100644 index 1b8abc0..0000000 --- a/net-im/mirage/mirage-0.6.4.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..8} ) -inherit qmake-utils python-single-r1 xdg - -DESCRIPTION="A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client." -HOMEPAGE="https://github.com/mirukana/mirage" - -# Currently only one submodule needed for the build, but keeping the capacity to add more submodules for the future. -SUBMODULE_COMMITS=( - "9e9be32d6010cad484a7b12b1a3d19c6cf4c1353" -) - -#[0] hsluv/hsluv-c - -if [[ "${PV}" == "9999" ]] -then - inherit git-r3 - EGIT_REPO_URI="https://github.com/mirukana/mirage.git" - EGIT_BRANCH="dev" - EGIT_SUBMODULES=( submodules/hsluv-c ) -else - SRC_URI=" - https://github.com/mirukana/"${PN}"/archive/v"${PV}".tar.gz -> "${PN}"-v"${PV}".tar.gz - https://github.com/hsluv/hsluv-c/archive/"${SUBMODULE_COMMITS[0]}".tar.gz -> hsluv-c-"${SUBMODULE_COMMITS[0]}".tar.gz - " - KEYWORDS="~amd64" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="X" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND=" - >=dev-qt/qtcore-5.12 - >=dev-qt/qtdeclarative-5.12 - >=dev-qt/qtquickcontrols2-5.12[widgets] - >=dev-qt/qtgraphicaleffects-5.12 - X? ( - x11-libs/libX11 - x11-libs/libXScrnSaver - ) -" - -RDEPEND=" - ${DEPEND} - ${PYTHON_DEPS} - >=dev-qt/qtgui-5.12[gif,png,jpeg] - >=dev-qt/qtimageformats-5.12 - >=dev-qt/qtsvg-5.12 - dev-libs/olm - dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}] - $(python_gen_cond_dep ' - dev-python/matrix-nio[e2e,${PYTHON_USEDEP}] - >=dev-python/aiofiles-0.4.0[${PYTHON_USEDEP}] - >=dev-python/appdirs-1.4.4[${PYTHON_USEDEP}] - >=dev-python/blist-1.3.6[${PYTHON_USEDEP}] - >=media-gfx/cairosvg-2.4.2[${PYTHON_USEDEP}] - >=dev-python/filetype-1.0.7[${PYTHON_USEDEP}] - >=dev-python/html_sanitizer-1.9.1[${PYTHON_USEDEP}] - >=dev-python/lxml-4.5.1[${PYTHON_USEDEP}] - >=dev-python/mistune-0.8.4[${PYTHON_USEDEP}] - >=dev-python/pillow-7.0.0[${PYTHON_USEDEP}] - >=dev-python/pymediainfo-4.2.1[${PYTHON_USEDEP}] - python_single_target_python3_7? ( >=dev-python/pyfastcopy-1.0.3[python_targets_python3_7] ) - - ') - media-libs/libjpeg-turbo - media-libs/libmediainfo - media-libs/libwebp - media-libs/tiff - media-libs/openjpeg:2 - sys-libs/zlib -" - -src_prepare() { - move_lib() { - local IN_DIR="${1}" - local OUT_DIR - [ -z "${2}" ] && OUT_DIR="${IN_DIR}" || OUT_DIR=""${2%/}"/"${IN_DIR}"" - mv ""${WORKDIR}"/"${IN_DIR}""*/* ""${S}"/"${OUT_DIR}"" || die - } - if [ "${PV}" != "9999" ]; then - local submodules_libs="hsluv-c" - for submodules_lib in ${submodules_libs} ; do - move_lib "${submodules_lib}" submodules - done - fi - eapply_user -} - -src_configure() { - if use !X; then - myconf="CONFIG+=no-x11" - fi - eqmake5 mirage.pro PREFIX="${D}"/usr ${myconf} -} diff --git a/net-im/mirage/mirage-0.7.0.ebuild b/net-im/mirage/mirage-0.7.0.ebuild deleted file mode 100644 index a3f746b..0000000 --- a/net-im/mirage/mirage-0.7.0.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit qmake-utils python-single-r1 xdg - -DESCRIPTION="A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client." -HOMEPAGE="https://github.com/mirukana/mirage" - -# Currently only one submodule needed for the build, but keeping the capacity to add more submodules for the future. -SUBMODULE_COMMITS=( - "9e9be32d6010cad484a7b12b1a3d19c6cf4c1353" -) - -#[0] hsluv/hsluv-c - -if [[ "${PV}" == "9999" ]] -then - inherit git-r3 - EGIT_REPO_URI="https://github.com/mirukana/mirage.git" - EGIT_BRANCH="dev" - EGIT_SUBMODULES=( submodules/hsluv-c ) -else - SRC_URI=" - https://github.com/mirukana/"${PN}"/archive/v"${PV}".tar.gz -> "${PN}"-v"${PV}".tar.gz - https://github.com/hsluv/hsluv-c/archive/"${SUBMODULE_COMMITS[0]}".tar.gz -> hsluv-c-"${SUBMODULE_COMMITS[0]}".tar.gz - " - KEYWORDS="~amd64" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="X" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND=" - >=dev-qt/qtcore-5.12 - >=dev-qt/qtdeclarative-5.12 - >=dev-qt/qtquickcontrols2-5.12[widgets] - >=dev-qt/qtgraphicaleffects-5.12 - X? ( - x11-libs/libX11 - x11-libs/libXScrnSaver - ) -" - -RDEPEND=" - ${DEPEND} - ${PYTHON_DEPS} - >=dev-qt/qtgui-5.12[gif,png,jpeg] - >=dev-qt/qtimageformats-5.12 - >=dev-qt/qtsvg-5.12 - dev-libs/olm - dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}] - $(python_gen_cond_dep ' - >=dev-python/aiofiles-0.4.0[${PYTHON_USEDEP}] - >=dev-python/appdirs-1.4.4[${PYTHON_USEDEP}] - >=dev-python/dbus-python-1.2.16[${PYTHON_USEDEP}] - >=dev-python/filetype-1.0.7[${PYTHON_USEDEP}] - >=dev-python/hsluv-python-5.0.0[${PYTHON_USEDEP}] - >=dev-python/html_sanitizer-1.9.1[${PYTHON_USEDEP}] - >=dev-python/lxml-4.5.1[${PYTHON_USEDEP}] - >=dev-python/matrix-nio-0.17.0[e2e,${PYTHON_USEDEP}] - >=dev-python/mistune-0.8.4[${PYTHON_USEDEP}] - >=dev-python/pillow-7.0.0[${PYTHON_USEDEP}] - >=dev-python/plyer-1.4.3[${PYTHON_USEDEP}] - >=dev-python/pymediainfo-4.2.1[${PYTHON_USEDEP}] - >=dev-python/redbaron-0.9.2[${PYTHON_USEDEP}] - >=dev-python/simpleaudio-1.0.4[${PYTHON_USEDEP}] - >=dev-python/sortedcontainers-2.2.2[${PYTHON_USEDEP}] - >=dev-python/watchgod-0.6[${PYTHON_USEDEP}] - >=media-gfx/cairosvg-2.4.2[${PYTHON_USEDEP}] - python_single_target_python3_7? ( >=dev-python/pyfastcopy-1.0.3[python_targets_python3_7] ) - - ') - media-libs/alsa-lib - media-libs/libjpeg-turbo - media-libs/libmediainfo - media-libs/libwebp - media-libs/tiff - media-libs/openjpeg:2 - sys-libs/zlib -" - -src_prepare() { - move_lib() { - local IN_DIR="${1}" - local OUT_DIR - [ -z "${2}" ] && OUT_DIR="${IN_DIR}" || OUT_DIR=""${2%/}"/"${IN_DIR}"" - mv ""${WORKDIR}"/"${IN_DIR}""*/* ""${S}"/"${OUT_DIR}"" || die - } - if [ "${PV}" != "9999" ]; then - local submodules_libs="hsluv-c" - for submodules_lib in ${submodules_libs} ; do - move_lib "${submodules_lib}" submodules - done - fi - eapply_user -} - -src_configure() { - if use !X; then - myconf="CONFIG+=no-x11" - fi - eqmake5 mirage.pro PREFIX="${D}"/usr ${myconf} -} diff --git a/net-im/mirage/mirage-0.7.1.ebuild b/net-im/mirage/mirage-0.7.1.ebuild index a3f746b..39637e5 100644 --- a/net-im/mirage/mirage-0.7.1.ebuild +++ b/net-im/mirage/mirage-0.7.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..9} ) inherit qmake-utils python-single-r1 xdg @@ -73,8 +73,6 @@ RDEPEND=" >=dev-python/sortedcontainers-2.2.2[${PYTHON_USEDEP}] >=dev-python/watchgod-0.6[${PYTHON_USEDEP}] >=media-gfx/cairosvg-2.4.2[${PYTHON_USEDEP}] - python_single_target_python3_7? ( >=dev-python/pyfastcopy-1.0.3[python_targets_python3_7] ) - ') media-libs/alsa-lib media-libs/libjpeg-turbo @@ -105,5 +103,9 @@ src_configure() { if use !X; then myconf="CONFIG+=no-x11" fi - eqmake5 mirage.pro PREFIX="${D}"/usr ${myconf} + eqmake5 mirage.pro PREFIX="${EPREFIX}/usr" ${myconf} +} + +src_install() { + emake INSTALL_ROOT="${D}" install } diff --git a/net-im/mirage/mirage-9999.ebuild b/net-im/mirage/mirage-9999.ebuild index a3f746b..39637e5 100644 --- a/net-im/mirage/mirage-9999.ebuild +++ b/net-im/mirage/mirage-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..9} ) inherit qmake-utils python-single-r1 xdg @@ -73,8 +73,6 @@ RDEPEND=" >=dev-python/sortedcontainers-2.2.2[${PYTHON_USEDEP}] >=dev-python/watchgod-0.6[${PYTHON_USEDEP}] >=media-gfx/cairosvg-2.4.2[${PYTHON_USEDEP}] - python_single_target_python3_7? ( >=dev-python/pyfastcopy-1.0.3[python_targets_python3_7] ) - ') media-libs/alsa-lib media-libs/libjpeg-turbo @@ -105,5 +103,9 @@ src_configure() { if use !X; then myconf="CONFIG+=no-x11" fi - eqmake5 mirage.pro PREFIX="${D}"/usr ${myconf} + eqmake5 mirage.pro PREFIX="${EPREFIX}/usr" ${myconf} +} + +src_install() { + emake INSTALL_ROOT="${D}" install }