summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Golubev <fatzer2@gmail.com>2024-02-04 06:27:51 +0300
committerSlávek Banko <slavek.banko@axis.cz>2024-02-04 10:56:47 +0100
commitff2b4ff14f6585974aaf8d12773de59b3fcf721e (patch)
treed3d1b7144601509974925e1414e5f21c35c1ccc1
parentb09fdd31aa555addfe87d14225d65dd3e82a9b09 (diff)
downloadtde-packaging-gentoo-ff2b4ff14f6585974aaf8d12773de59b3fcf721e.tar.gz
tde-packaging-gentoo-ff2b4ff14f6585974aaf8d12773de59b3fcf721e.zip
trinity-apps/amarok: move ruby to RDEPEND
- move ruby to RDEPEND as it isn't required during build - simplify mysql/mariadb handling Signed-off-by: Alexander Golubev <fatzer2@gmail.com> (cherry picked from commit d9d89d8e5fc35afdf97564217698d17fb38aa06a)
-rw-r--r--trinity-apps/amarok/amarok-14.1.0.ebuild18
-rw-r--r--trinity-apps/amarok/amarok-14.1.1.ebuild18
-rw-r--r--trinity-apps/amarok/amarok-9999.ebuild18
3 files changed, 15 insertions, 39 deletions
diff --git a/trinity-apps/amarok/amarok-14.1.0.ebuild b/trinity-apps/amarok/amarok-14.1.0.ebuild
index 0c88fd13..cf0daccc 100644
--- a/trinity-apps/amarok/amarok-14.1.0.ebuild
+++ b/trinity-apps/amarok/amarok-14.1.0.ebuild
@@ -44,7 +44,6 @@ REQUIRED_USE="|| ( xine akode ) mysql? ( !mariadb )"
DEPEND="
dev-db/sqlite
- dev-lang/ruby:*
media-libs/taglib
akode? ( ~media-libs/akode-${PV} )
ifp? ( media-libs/libifp )
@@ -62,16 +61,9 @@ DEPEND="
)
xine? ( media-libs/xine-lib )
"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- if use mysql ; then
- sed -i 's/mariadb_config mysql_config/mysql_config/' "${S}/ConfigureChecks.cmake"
- elif use mariadb ; then
- sed -i 's/mariadb_config mysql_config/mariadb_config/' "${S}/ConfigureChecks.cmake"
- fi
- trinity-base-2_src_prepare
-}
+RDEPEND="${DEPEND}
+ dev-lang/ruby:*
+"
src_configure() {
local mycmakeargs=(
@@ -94,9 +86,9 @@ src_configure() {
-DWITH_XINE="$(usex xine)"
)
if use mysql ; then
- mycmakeargs+=( -DWITH_MYSQL=ON )
+ mycmakeargs+=( -DWITH_MYSQL=ON -DMYSQL_CONFIG="${ESYSROOT}/usr/bin/mysql_config" )
elif use mariadb ; then
- mycmakeargs+=( -DWITH_MYSQL=ON )
+ mycmakeargs+=( -DWITH_MYSQL=ON -DMYSQL_CONFIG="${ESYSROOT}/usr/bin/mariadb_config" )
fi
trinity-base-2_src_configure
diff --git a/trinity-apps/amarok/amarok-14.1.1.ebuild b/trinity-apps/amarok/amarok-14.1.1.ebuild
index 0c88fd13..cf0daccc 100644
--- a/trinity-apps/amarok/amarok-14.1.1.ebuild
+++ b/trinity-apps/amarok/amarok-14.1.1.ebuild
@@ -44,7 +44,6 @@ REQUIRED_USE="|| ( xine akode ) mysql? ( !mariadb )"
DEPEND="
dev-db/sqlite
- dev-lang/ruby:*
media-libs/taglib
akode? ( ~media-libs/akode-${PV} )
ifp? ( media-libs/libifp )
@@ -62,16 +61,9 @@ DEPEND="
)
xine? ( media-libs/xine-lib )
"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- if use mysql ; then
- sed -i 's/mariadb_config mysql_config/mysql_config/' "${S}/ConfigureChecks.cmake"
- elif use mariadb ; then
- sed -i 's/mariadb_config mysql_config/mariadb_config/' "${S}/ConfigureChecks.cmake"
- fi
- trinity-base-2_src_prepare
-}
+RDEPEND="${DEPEND}
+ dev-lang/ruby:*
+"
src_configure() {
local mycmakeargs=(
@@ -94,9 +86,9 @@ src_configure() {
-DWITH_XINE="$(usex xine)"
)
if use mysql ; then
- mycmakeargs+=( -DWITH_MYSQL=ON )
+ mycmakeargs+=( -DWITH_MYSQL=ON -DMYSQL_CONFIG="${ESYSROOT}/usr/bin/mysql_config" )
elif use mariadb ; then
- mycmakeargs+=( -DWITH_MYSQL=ON )
+ mycmakeargs+=( -DWITH_MYSQL=ON -DMYSQL_CONFIG="${ESYSROOT}/usr/bin/mariadb_config" )
fi
trinity-base-2_src_configure
diff --git a/trinity-apps/amarok/amarok-9999.ebuild b/trinity-apps/amarok/amarok-9999.ebuild
index 988d12b2..7a018774 100644
--- a/trinity-apps/amarok/amarok-9999.ebuild
+++ b/trinity-apps/amarok/amarok-9999.ebuild
@@ -44,7 +44,6 @@ REQUIRED_USE="|| ( xine akode ) mysql? ( !mariadb )"
DEPEND="
dev-db/sqlite
- dev-lang/ruby:*
media-libs/taglib
akode? ( ~media-libs/akode-${PV} )
ifp? ( media-libs/libifp )
@@ -62,16 +61,9 @@ DEPEND="
)
xine? ( media-libs/xine-lib )
"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- if use mysql ; then
- sed -i 's/mariadb_config mysql_config/mysql_config/' "${S}/ConfigureChecks.cmake"
- elif use mariadb ; then
- sed -i 's/mariadb_config mysql_config/mariadb_config/' "${S}/ConfigureChecks.cmake"
- fi
- trinity-base-2_src_prepare
-}
+RDEPEND="${DEPEND}
+ dev-lang/ruby:*
+"
src_configure() {
local mycmakeargs=(
@@ -94,9 +86,9 @@ src_configure() {
-DWITH_XINE="$(usex xine)"
)
if use mysql ; then
- mycmakeargs+=( -DWITH_MYSQL=ON )
+ mycmakeargs+=( -DWITH_MYSQL=ON -DMYSQL_CONFIG="${ESYSROOT}/usr/bin/mysql_config" )
elif use mariadb ; then
- mycmakeargs+=( -DWITH_MYSQL=ON )
+ mycmakeargs+=( -DWITH_MYSQL=ON -DMYSQL_CONFIG="${ESYSROOT}/usr/bin/mariadb_config" )
fi
trinity-base-2_src_configure