Compare commits

..

No commits in common. "51641cf4d99ab72d3de95cd49bf9177c6745959e" and "d758737e302791c92173ece87810239334b88695" have entirely different histories.

3 changed files with 5 additions and 7 deletions

View File

@ -34,7 +34,7 @@ KEYWORDS="~amd64"
SLOT="0" SLOT="0"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1" LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
IUSE="+clang cpu_flags_arm_neon dbus debug +buildtarball geckodriver IUSE="+clang cpu_flags_arm_neon dbus debug geckodriver
hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux
+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
+system-libvpx +system-webp wayland wifi" +system-libvpx +system-webp wayland wifi"
@ -87,7 +87,6 @@ BDEPEND="${PYTHON_DEPS}
)" )"
CDEPEND=" CDEPEND="
buildtarball? ( ~www-client/makeicecat-"${PV}"[buildtarball] )
>=dev-libs/nss-3.53.1 >=dev-libs/nss-3.53.1
>=dev-libs/nspr-4.25 >=dev-libs/nspr-4.25
dev-libs/atk dev-libs/atk
@ -353,7 +352,7 @@ pkg_setup() {
} }
src_unpack() { src_unpack() {
use buildtarball && unpack /usr/src/makeicecat-"${PV}"/output/icecat-"${PV}"-gnu1.tar.bz2 || eerror "Tarball missing, check www-client/makeicecat is correct" unpack /usr/share/makeicecat-"${PV}"/output/icecat-"${PV}"-gnu1.tar.bz2 || eerror "Tarball missing, check www-client/makeicecat is correct"
unpack "${FIREFOX_PATCHSET}" unpack "${FIREFOX_PATCHSET}"
} }

View File

@ -2,7 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata> <pkgmetadata>
<use> <use>
<flag name="buildtarball">Build tarball with makeicecat</flag>
<flag name="clang">Use Clang compiler instead of GCC</flag> <flag name="clang">Use Clang compiler instead of GCC</flag>
<flag name="geckodriver">Enable WebDriver support</flag> <flag name="geckodriver">Enable WebDriver support</flag>
<flag name="hwaccel">Force-enable hardware-accelerated rendering (Mozilla bug 594876)</flag> <flag name="hwaccel">Force-enable hardware-accelerated rendering (Mozilla bug 594876)</flag>

View File

@ -33,11 +33,11 @@ src_compile() {
} }
src_install() { src_install() {
insinto /usr/src/makeicecat-"${PV}" insinto /usr/share/makeicecat-"${PV}"
doins -r "${S}"/{artwork,CHANGELOG,COPYING,data,makeicecat,README,tools} doins -r "${S}"/{artwork,CHANGELOG,COPYING,data,makeicecat,README,tools}
fperms +x /usr/src/makeicecat-"${PV}"/{makeicecat,tools/{AddonsScraper.py,buildbinaries,createdebsrcrepo,gnupload}} fperms +x /usr/share/makeicecat-"${PV}"/{makeicecat,tools/{AddonsScraper.py,buildbinaries,createdebsrcrepo,gnupload}}
if use buildtarball; then if use buildtarball; then
insinto /usr/src/makeicecat-"${PV}"/output insinto /usr/share/makeicecat-"${PV}"/output
doins "${S}"/output/icecat-"${PV}"-gnu1.tar.bz2 doins "${S}"/output/icecat-"${PV}"-gnu1.tar.bz2
fi fi
} }