www-client/icecat/icecat-78.8.0.ebuild

@@ -34,7 +34,7 @@ KEYWORDS="~amd64"
 
 SLOT="0"
 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
 	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
 	+system-libvpx +system-webp wayland wifi"
@@ -87,7 +87,6 @@ BDEPEND="${PYTHON_DEPS}
 	)"
 
 CDEPEND="
-	buildtarball? ( ~www-client/makeicecat-"${PV}"[buildtarball] )
 	>=dev-libs/nss-3.53.1
 	>=dev-libs/nspr-4.25
 	dev-libs/atk
@@ -353,7 +352,7 @@ pkg_setup() {
 }
 
 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}"
 }
 

www-client/icecat/metadata.xml

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

www-client/makeicecat/makeicecat-78.8.0.ebuild

@@ -33,11 +33,11 @@ src_compile() {
 }
 
 src_install() {
-	insinto /usr/src/makeicecat-"${PV}"
+	insinto /usr/share/makeicecat-"${PV}"
 	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
-		insinto /usr/src/makeicecat-"${PV}"/output
+		insinto /usr/share/makeicecat-"${PV}"/output
 		doins "${S}"/output/icecat-"${PV}"-gnu1.tar.bz2
 	fi
 }