summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2018-04-20 10:04:08 +0200
committerDavid Seifert <soap@gentoo.org>2018-04-20 10:04:34 +0200
commit83f82c477f328cfbd174ce89c535b825ab103b19 (patch)
treee83e51cb36d7ff52254c05629c89ba004355e745 /media-libs/freetype
parentsci-mathematics/pari: Remove old version (diff)
downloadgentoo-83f82c477f328cfbd174ce89c535b825ab103b19.tar.gz
gentoo-83f82c477f328cfbd174ce89c535b825ab103b19.tar.bz2
gentoo-83f82c477f328cfbd174ce89c535b825ab103b19.zip
*/*: Remove emul-linux-x86-* blockers
Closes: https://github.com/gentoo/gentoo/pull/8073
Diffstat (limited to 'media-libs/freetype')
-rw-r--r--media-libs/freetype/freetype-2.8.1.ebuild6
-rw-r--r--media-libs/freetype/freetype-2.8.ebuild6
-rw-r--r--media-libs/freetype/freetype-2.9.ebuild6
-rw-r--r--media-libs/freetype/freetype-9999.ebuild5
4 files changed, 8 insertions, 15 deletions
diff --git a/media-libs/freetype/freetype-2.8.1.ebuild b/media-libs/freetype/freetype-2.8.1.ebuild
index baa5cd66018c..03294bc1c4ef 100644
--- a/media-libs/freetype/freetype-2.8.1.ebuild
+++ b/media-libs/freetype/freetype-2.8.1.ebuild
@@ -23,7 +23,7 @@ IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
infinality png static-libs utils"
RESTRICT="!bindist? ( bindist )" # bug 541408
-CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] )
@@ -34,10 +34,8 @@ CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
)
)"
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )"
PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
PATCHES=(
diff --git a/media-libs/freetype/freetype-2.8.ebuild b/media-libs/freetype/freetype-2.8.ebuild
index 20b26eccba27..4dfd2a7b4962 100644
--- a/media-libs/freetype/freetype-2.8.ebuild
+++ b/media-libs/freetype/freetype-2.8.ebuild
@@ -23,7 +23,7 @@ IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
infinality png static-libs utils"
RESTRICT="!bindist? ( bindist )" # bug 541408
-CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] )
@@ -34,10 +34,8 @@ CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
)
)"
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )"
PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
PATCHES=(
diff --git a/media-libs/freetype/freetype-2.9.ebuild b/media-libs/freetype/freetype-2.9.ebuild
index cd02458948fa..4d9867d2f4f4 100644
--- a/media-libs/freetype/freetype-2.9.ebuild
+++ b/media-libs/freetype/freetype-2.9.ebuild
@@ -23,7 +23,7 @@ IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
infinality png static-libs utils"
RESTRICT="!bindist? ( bindist )" # bug 541408
-CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] )
@@ -34,10 +34,8 @@ CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
)
)"
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )"
PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
PATCHES=(
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 4288d7cd6397..4fa091f67693 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -30,7 +30,7 @@ LICENSE="|| ( FTL GPL-2+ )"
SLOT="2"
RESTRICT="!bindist? ( bindist )" # bug 541408
-CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
@@ -41,9 +41,8 @@ CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
)
)"
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
virtual/pkgconfig"
-RDEPEND="${CDEPEND}"
PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
PATCHES=(