Version bumps

shiznix · Jul 22, 2016 · 6d3f2b6 · 6d3f2b6
1 parent 2dfcfc1
commit 6d3f2b6
Show file tree

Hide file tree

Showing 21 changed files with 128 additions and 142 deletions.
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
diff --git a/...rd/thunderbird-38.8.0_p0_p00160401.ebuild → ...rd/thunderbird-45.2.0_p0_p00160401.ebuild b/...rd/thunderbird-38.8.0_p0_p00160401.ebuild → ...rd/thunderbird-45.2.0_p0_p00160401.ebuild
@@ -5,8 +5,8 @@
 EAPI=6
 WANT_AUTOCONF="2.1"
 MOZ_ESR=""
-MOZ_LIGHTNING_VER="4.0.8"
-MOZ_LIGHTNING_GDATA_VER="1.9"
+MOZ_LIGHTNING_VER="4.7.2"
+MOZ_LIGHTNING_GDATA_VER="2.6"
 
 # This list can be updated using scripts/get_langs.sh from the mozilla overlay
 MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
@@ -27,17 +27,17 @@ fi
 MOZ_P="${PN}-${MOZ_PV}"
 
 # Enigmail version
-EMVER="1.8.2"
+EMVER="1.9.1"
 
 # Patches
 PATCH="thunderbird-38.0-patches-0.1"
-PATCHFF="firefox-38.0-patches-05"
+PATCHFF="firefox-45.0-patches-04"
 
 MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases"
 MOZCONFIG_OPTIONAL_JIT="enabled"
 
 URELEASE="xenial-security"
-inherit flag-o-matic toolchain-funcs mozconfig-v6.38 makeedit multilib autotools pax-utils check-reqs nsplugins mozlinguas ubuntu-versionator
+inherit flag-o-matic toolchain-funcs mozconfig-v6.45 makeedit multilib autotools pax-utils check-reqs nsplugins mozlinguas-v2 ubuntu-versionator
 
 UVER_PREFIX="+build1"
 UURL="mirror://unity/pool/main/t/${PN}"
@@ -56,18 +56,18 @@ RESTRICT="!bindist? ( bindist )
 #${MOZ_HTTP_URI/${PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
 PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCH},${PATCHFF}}.tar.xz )
 SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
+	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
 	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
-	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
+	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}-r1.tar.xz )
 	crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
 	${PATCH_URIS[@]}
 	${UURL}/${MY_P}${UVER_PREFIX}-${UVER}.debian.tar.xz"
 
 ASM_DEPEND=">=dev-lang/yasm-1.1"
 
 CDEPEND="
-	>=dev-libs/nss-3.21
-	>=dev-libs/nspr-4.10.10
+	>=dev-libs/nss-3.21.1
+	>=dev-libs/nspr-4.12
 	!x11-plugins/enigmail
 	crypt?  ( || (
 		( >=app-crypt/gnupg-2.0
@@ -90,12 +90,6 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-thunderbird )
 "
 
-if [[ ${PV} =~ beta ]]; then
-	S="${WORKDIR}/comm-beta"
-else
-	S="${WORKDIR}/comm-esr${PV%%.*}"
-fi
-
 BUILD_OBJ_DIR="${S}/tbird"
 
 pkg_setup() {
@@ -146,17 +140,12 @@ src_prepare() {
 	ubuntu-versionator_src_prepare
 
 	# Apply our Thunderbird patchset
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/thunderbird"
+	rm -f "${WORKDIR}"/thunderbird/2001_ldap_respect_cflags.patch
+	eapply "${WORKDIR}/thunderbird"
 
 	# Apply our patchset from firefox to thunderbird as well
 	pushd "${S}"/mozilla &>/dev/null || die
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	EPATCH_EXCLUDE="8010_bug114311-freetype26.patch
-			8011_bug1194520-freetype261_until_moz43.patch" \
-	epatch "${WORKDIR}/firefox"
+	eapply "${WORKDIR}/firefox"
 	popd &>/dev/null || die
 
 	# Ensure that are plugins dir is enabled as default
@@ -202,7 +191,6 @@ src_prepare() {
 }
 
 src_configure() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
 	MEXTENSIONS="default"
 
 	####################################
@@ -214,9 +202,6 @@ src_configure() {
 	mozconfig_init
 	mozconfig_config
 
-	# We want rpath support to prevent unneeded hacks on different libc variants
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}"
-
 	# It doesn't compile on alpha without this LDFLAGS
 	use alpha && append-ldflags "-Wl,--no-relax"
 
@@ -228,7 +213,6 @@ src_configure() {
 	mozconfig_annotate '' --enable-calendar
 
 	# Other tb-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
 	mozconfig_annotate '' --with-user-appdir=.thunderbird
 
 	mozconfig_use_enable ldap
@@ -284,9 +268,6 @@ src_compile() {
 }
 
 src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
-
 	declare emid
 	cd "${BUILD_OBJ_DIR}" || die
 
@@ -295,10 +276,15 @@ src_install() {
 		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
 		|| die
 
-	# Set default path to search for dictionaries.
-	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
-		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
+	mozconfig_install_prefs \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js"
+
+	# dev-db/sqlite does not have FTS3_TOKENIZER support.
+	# gloda needs it to function, and bad crashes happen when its enabled and doesn't work
+	if in_iuse system-sqlite && use system-sqlite ; then
+		echo "lockPref(\"mailnews.database.global.indexer.enabled\", false);" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+	fi
 
 	# Pax mark xpcshell for hardened support, only used for startupcache creation.
 	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell

diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
@@ -1 +1 @@
-unity	http://mirror.internode.on.net/pub/ubuntu/ubuntu/ http://mirror.netspace.net.au/pub/ubuntu/ http://mirror.overthewire.com.au/ubuntu/ http://ubuntu.inode.at/ubuntu/ http://ftp.byfly.by/ubuntu/ http://mirror.unix-solutions.be/ubuntu/ http://ubuntu.c3sl.ufpr.br/ubuntu/ http://mirror.unesp.br/ubuntu/ http://ubuntu-archive.locaweb.com.br/ubuntu/ http://ubuntu.uni-sofia.bg/ubuntu/ http://mirror.it.ubc.ca/ubuntu/ http://hr.archive.ubuntu.com/ubuntu/ http://cz.archive.ubuntu.com/ubuntu/ http://ftp.cvut.cz/ubuntu/ http://ftp.klid.dk/ftp/ubuntu/ http://bouyguestelecom.ubuntu.lafibre.info/ubuntu/ http://mirror.plusserver.com/ubuntu/ubuntu/ http://wwwftp.ciril.fr/pub/linux/ubuntu/archives/ http://ubuntu.grena.ge/ubuntu/ http://ftp-stud.hs-esslingen.de/ubuntu/ http://ftp.uni-kl.de/pub/linux/ubuntu/ http://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu/ http://ftp.rz.tu-bs.de/pub/mirror/ubuntu-packages/ http://vesta.informatik.rwth-aachen.de/ftp/pub/Linux/ubuntu/ubuntu/ http://suse.uni-leipzig.de/pub/releases.ubuntu.com/ubuntu/ http://ftp.hosteurope.de/mirror/archive.ubuntu.com/ http://de.archive.ubuntu.com/ubuntu/ http://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/ http://ftp.kfki.hu/linux/ubuntu/ http://ftp.freepark.org/ubuntu/ http://mirror.unej.ac.id/ubuntu/ http://mirror.network32.net/ubuntu/ http://ftp.tsukuba.wide.ad.jp/Linux/ubuntu/ http://ubuntu-archive.mirror.liquidtelecom.com/ubuntu/ http://ubuntu.koyanet.lv/ubuntu/ http://mirror.soften.ktu.lt/ubuntu/ http://ubuntu.mirror.vu.lt/ubuntu/ http://ubuntu.dts.mg/ubuntu/ http://nl.archive.ubuntu.com/ubuntu/ http://ftp.nluug.nl/os/Linux/distr/ubuntu/ http://nl3.archive.ubuntu.com/ubuntu/ http://mirrors.nl.eu.kernel.org/ubuntu/ http://ftp.citylink.co.nz/ubuntu/ http://no.archive.ubuntu.com/ubuntu/ http://ftp.astral.ro/mirrors/ubuntu.com/ubuntu/ http://mirrors.ulbsibiu.ro/ubuntu/ http://mirror.timeweb.ru/ubuntu/ http://mirror.logol.ru/ubuntu/ http://ubuntu.grn.cat/ubuntu/ http://ubuntu.cybercomhosting.com/ubuntu/ http://ubuntu.mirror.tn/ubuntu/ http://ubuntu.gnu.gen.tr/ubuntu/ http://ubuntu-mirror.neocom.org.ua/ubuntu/ http://mirror.vorboss.net/ubuntu-archive/ http://mirror.as29550.net/archive.ubuntu.com/ http://mirror.cc.columbia.edu/pub/linux/ubuntu/archive/ http://mirrors.us.kernel.org/ubuntu/ http://ubuntu.mirror.constant.com/ http://ubuntu.osuosl.org/ubuntu/ http://mirror.jmu.edu/pub/ubuntu/ http://mirrors.easynews.com/linux/ubuntu/ http://mirrors.ocf.berkeley.edu/ubuntu/ http://mirror.stjschools.org/public/ubuntu-archive/ http://mirror.zol.co.zw/ubuntu/
+unity	http://mirror.internode.on.net/pub/ubuntu/ubuntu/ http://ubuntu.mirror.digitalpacific.com.au/archive/ http://ubuntu.uni-klu.ac.at/ubuntu/ http://ubuntu.c3sl.ufpr.br/ubuntu/ http://ubuntu-archive.locaweb.com.br/ubuntu/ http://ubuntu.ipacct.com/ubuntu/ http://ubuntu.uni-sofia.bg/ubuntu/ http://muug.ca/mirror/ubuntu/ http://ftp.tecnoera.com/ubuntu/ http://ftp.sjtu.edu.cn/ubuntu/ http://ubuntu.uniminuto.edu/ubuntu/ http://hr.archive.ubuntu.com/ubuntu/ http://cz.archive.ubuntu.com/ubuntu/ http://mirror.dkm.cz/ubuntu/ http://mirror.easyspeedy.com/ubuntu/ http://mirrors.dk.telia.net/ubuntu/ http://mirror.cedia.org.ec/ubuntu/ http://mirror.espol.edu.ec/ubuntu/ http://pf.archive.ubuntu.com/ubuntu/ http://mirror.netcologne.de/ubuntu/ http://artfiles.org/ubuntu.com/ http://ftp.rz.tu-bs.de/pub/mirror/ubuntu-packages/ http://de2.archive.ubuntu.com/ubuntu/ http://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/ http://mirror.greennet.gl/ubuntu/ http://ftp.kfki.hu/linux/ubuntu/ http://mirror.network32.net/ubuntu/ http://ubuntu.mirror.garr.it/ubuntu/ http://ubuntutym.u-toyama.ac.jp/ubuntu/ http://ubuntu-ashisuto.ubuntulinux.jp/ubuntu/ http://ubuntu-archive.mirror.liquidtelecom.com/ubuntu/ http://kr.archive.ubuntu.com/ubuntu/ http://ubuntu.mirror.vu.lt/ubuntu/ http://ftp.litnet.lt/ubuntu/ http://nl.archive.ubuntu.com/ubuntu/ http://mirror.nforce.com/pub/linux/ubuntu/ http://mirror.amsiohosting.net/archive.ubuntu.com/ http://nl3.archive.ubuntu.com/ubuntu/ http://mirrors.nl.eu.kernel.org/ubuntu/ http://ftp.citylink.co.nz/ubuntu/ http://ucmirror.canterbury.ac.nz/ubuntu/ http://nz.archive.ubuntu.com/ubuntu/ http://no.archive.ubuntu.com/ubuntu/ http://ftp.icm.edu.pl/pub/Linux/ubuntu/ http://ftp.vectranet.pl/ubuntu/ http://piotrkosoft.net/pub/mirrors/ubuntu/ http://ftp.astral.ro/mirrors/ubuntu.com/ubuntu/ http://mirrors.pidginhost.com/ubuntu/ http://mirrors.se.eu.kernel.org/ubuntu/ http://archive.ubuntu.csg.uzh.ch/ubuntu/ http://free.nchc.org.tw/ubuntu/ http://ftp.tku.edu.tw/ubuntu/ http://ubuntu.mirror.tn/ubuntu/ http://ubuntu.gnu.gen.tr/ubuntu/ http://mirror.mirohost.net/ubuntu/ http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/ http://mirror.math.princeton.edu/pub/ubuntu/ http://mirror.n5tech.com/ubuntu/ http://mirror.pnl.gov/ubuntu/ http://ubuntu.cs.utah.edu/ubuntu/ http://ubuntu.mirror.constant.com/ http://mirrors.maine.edu/ubuntu/ http://mirrors.namecheap.com/ubuntu/ http://ubuntu.mirrors.tds.net/pub/ubuntu/ http://ubuntuarchive.mirror.nac.net/ http://mirror.zol.co.zw/ubuntu/
diff --git a/unity-base/bamf/Manifest b/unity-base/bamf/Manifest
@@ -1,6 +1,6 @@
 AUX bamf-0.5.0-disable-gtester2xunit-check.patch 774 SHA256 5f62456a02a57ce9afebf2d0848d6cf6522a43b6240cb0a129357d3f288a4a97 SHA512 fd53820b7dff7a77c37ed090999a5291362f69ecc1dfbadd5c9dfa400eb1ff37f11bc7b3340078ea6188a41ef503bbade8873a02cfe1cf362e8472cee1a16682 WHIRLPOOL c13fe9e2bbeaac00015da54885b47be9fe54e80bd004206aced1a1bd06d7539fd72f06c1fdd4f930a7bfd17c38f513d9feac1b729839702a793d17c3daa0f2fe
 AUX bamf-0.5.0-remove-desktop-fullname.patch 799 SHA256 8277bd7c73ffefa9f0537d1a3205afa51a1a0dac21d8e941ebc25287666bd69f SHA512 e6312052a868c817dc2ebdeddd7b34f6b26a886a6f489690fda1a226c38cf8137f41b24c9c033b73d0ce0792ac4f7293d21ae9dffbd47a22464ebd5d0bb4f376 WHIRLPOOL 2ebe5916f4d5cc6009b84ff91c5a19c5930f56e3f4f65f80ea0aee518d204cce214f026e646a35657f482e2be1805c8645e5d366afc2081f4786858ccb6213b6
-DIST bamf_0.5.3~bzr0+16.04.20160523-0ubuntu1.diff.gz 15288 SHA256 24e54d1dd5ad9b3189b7a51ae8d35e4911c6d28eb73efc48c3bcaf18c3ad9c9e SHA512 cd1358029c001438565bdc21069bd0cc8ef7ca283fa174607210b834280236189003e6d5ab6455d56e8a4241bfa0c7b660e6dd75814660bfc88e7016617faf95 WHIRLPOOL d5425ab290f0a4cae1fad93cb763de3b065f6953c3d01b7bb3a96ebb904118e953acdcf6f9b8e4c47d8d56beb7c6e669bf69984c2e1ae60aa63e8041bfb8ee9f
-DIST bamf_0.5.3~bzr0+16.04.20160523.orig.tar.gz 167371 SHA256 d7c1733f74dafa331c4d5849f3961a1d5eb7f9adda12925f54ddaa7cbbe4beed SHA512 2c8eb987130433a398d60dfabbc5f2e48eb3f974c0d470b21ea3b249a61df8346b904e5188761b34c4a53c27cfb85cdfa58257a1e186a475c9a32cbd29208a12 WHIRLPOOL 4161522338ca4d47f05b1416fb44215e9e950e903c900a9fbc22d46f7b47c3b4fc3b1c170290c33392c5b833ec8987bf1d9f465d3ea6ae450b394ac972365b5d
-EBUILD bamf-0.5.3_p0_p01_p20160523.ebuild 2347 SHA256 4b8bf90bc6624ae9b7d7ccc246c1a2536301106c5172d065b1e874692af0e71b SHA512 ab11ea2e9bdd3f5a9cead878d17693bf56aaa9dd7e9a9d9e3de15f490f6c107c723aa1761e3175c274e77bed9e5b917b907ba8ddf43dcc712afc95c07b15ecc8 WHIRLPOOL 202e8301764e669511fdd2b9e59563471a39d19a51595eca8ed8f3df473ffecf624cda53a956ececcb8b19cfded9827ffe382389e0f6373fe37e134e70967545
+DIST bamf_0.5.3~bzr0+16.04.20160701-0ubuntu1.diff.gz 15372 SHA256 28b3d07d10df9c588c7d2fd75f54e17f98132ac52d58961141c02c74bc2d8b79 SHA512 eaa5edf96b8d1db8c9098461fb9f5a95f195f6259bc9da886b725304cbc2add1a7aab871883cbf038e1671e0d24af51f5d5b04eb6ef4205143b76ff042b5274d WHIRLPOOL 12c1675e889fd670de3d9ba6b4719a7fa81afa4b4324edb8218d06b6c3fc59d794c7c0593735f60d409506ad196614d403cb6a9f4c3abca129ace098ee13f87d
+DIST bamf_0.5.3~bzr0+16.04.20160701.orig.tar.gz 167867 SHA256 fc5a16daf96e9cd9ad9313d8cdcc729888fee7ce22bec9087a68d14776b43bf9 SHA512 00134ceb52847eabac4b01d5eb2a5b78245697760d5dc8852200d5d739f4178357881a1724afa18b598aeee20b4878d24c7cfe7f862ba1d4c497047141515de0 WHIRLPOOL c5c5ddad93bce176031dd3e530982fa0516fedf264fef82895d0efe0883c5b2e5fb6883fa7624b6bddb6a0e281c1c909de280d61ed823e8a8809caf77cc7909d
+EBUILD bamf-0.5.3_p0_p01_p20160701.ebuild 2347 SHA256 4b8bf90bc6624ae9b7d7ccc246c1a2536301106c5172d065b1e874692af0e71b SHA512 ab11ea2e9bdd3f5a9cead878d17693bf56aaa9dd7e9a9d9e3de15f490f6c107c723aa1761e3175c274e77bed9e5b917b907ba8ddf43dcc712afc95c07b15ecc8 WHIRLPOOL 202e8301764e669511fdd2b9e59563471a39d19a51595eca8ed8f3df473ffecf624cda53a956ececcb8b19cfded9827ffe382389e0f6373fe37e134e70967545
 MISC metadata.xml 362 SHA256 81909e6f96cd35fc7a97a5c9f1669292ff98d12690a7274920e7b8ed31ed02b7 SHA512 74e11b5a19cfe8aa9ed40021a7661aee3abec911b321ea75630d2e6799a4420e4251faef690d3296f689b17a03dc9aad89df56cfd064d84e824d712d3232efe8 WHIRLPOOL 0e8df343ad1219a4269fe1ba0cba1edf07c331e7e83800236294f4d1e7c9d88dfc0073674068f591d80e464389caa50099260f132b52f2b4d4168aa8fbeb4215
diff --git a/...e/bamf/bamf-0.5.3_p0_p01_p20160523.ebuild → ...e/bamf/bamf-0.5.3_p0_p01_p20160701.ebuild b/...e/bamf/bamf-0.5.3_p0_p01_p20160523.ebuild → ...e/bamf/bamf-0.5.3_p0_p01_p20160701.ebuild
diff --git a/unity-base/compiz/Manifest b/unity-base/compiz/Manifest
@@ -2,7 +2,7 @@ AUX compiz-0.9.8.0_base.cmake.diff 2165 SHA256 d1f5511fa89935bf7ad5321346d4f08f4
 AUX compiz-decorator 2927 SHA256 75d6717f48df4ad137bbd058f0706f85ed83d4b4636540de27088d9fb2854440 SHA512 4365927370bb1f1e0329b0d425cdccdef706e2340512c071fc800b6f58151184c270bcbf2400fce073f94869d80c19c956f3917155536afa234957853ffed253 WHIRLPOOL 798584710291de0d2c6cb31f780593963336c5c3902b30de699ba4096dd48f39a96f753a856f60aba03c33f66c0c41f94cae44427cac338b6efd33b8baed5c79
 AUX compiz-migrate-to-dconf.desktop 228 SHA256 ee00743eb1073091120700eba842be12aba7889b699b8aef061802c49291f181 SHA512 affbff2a8ce7d5f223ce86407ef0e80769f9df47228b7acdf25d0ac82b70b80a9b0bce4507df928b9738ef69d1dc8ab3a3622094b2e765f89d54db2b10899cc8 WHIRLPOOL 948c2ad714be68dc4f46d6b448c02c3034d1dc0fca84135b5391921127c916e804d08a2a8b266fbfd289cccdfbafd68e38b96ef7753aadc87f4fbcfb41906fd6
 AUX compiz.reset 1278 SHA256 e2a7a6779488afcc61d0fd30675295bd751590533af28bec8d3b1f278b407ac2 SHA512 77a224a97ce512cbe32dc2249120f318618bfb35ecad3f21909534c09bb006f67eaca818a4268768d960db37b8d56eb44f59bf32f2436f07848b358a353be0c0 WHIRLPOOL a5b7b1612f25d57ddc683acd92c3c4bc48de9d7c7cd1505853e7bed9bfd218b6415dda860c4dd36cb86ba79321e450ffcb428d615a05d49be445c1bd21722096
-DIST compiz_0.9.12.2+16.04.20160526-0ubuntu1.diff.gz 117820 SHA256 da79abc964d83e9076f58222190ea0d585334239e1ce4d2e7dd6d25cac5946a8 SHA512 30b346ee9a44593c723ae4976f599960654e16a5287a7fd355116351df419b2257f549d559c19b802c85f5724bf797ddc68d1d899c118b70bd352e254f128205 WHIRLPOOL 7caad3e236c0648284a52701741568eba1d01d9b6bd425570da44a9a9b39bea77ac5eb1d053077563f1a5e2ac793fe6132ae62df03da14ec02664b5febb9d664
-DIST compiz_0.9.12.2+16.04.20160526.orig.tar.gz 5572305 SHA256 dbadc99f66566494d3e8cf5bcf531a5c68a90d2122a58245ed27d32acdb371ba SHA512 3144be73fba094f6af59ac7356b7b10b4a5ffeb91e6763a4d85f691f1eb321f758f61e0b06ab7df2805229a33d0822c3e6f7b09aeee8e5efc472fa15fd6c716e WHIRLPOOL acff43957b0541f9331cd1f126deecb158ed9c394b6a029ac880eeac697a67b5aa8c6e4e20bfe7c644a7c02c9e8dff23b301959e439b915b59c98ba4ab136fb2
-EBUILD compiz-0.9.12.2_p0_p01_p20160526.ebuild 7332 SHA256 1329be123514758d37e9cd26492f3e8d5af0d8d2d0209b050830ad766bf34dd4 SHA512 ff8c1a49d2601a82e7db52398edfa105c26ae9c3af6f25ca6f75340409ce1224fc0a0c2d89b3bbf62f761c06d7097b3c8831a34d047bac600d6e30bd0acef38b WHIRLPOOL 48ec8a1ccb6a55448285055891df56b30b5c3c56433670b0feaaa7b454c493e2fe2c7c8bdfb6f19313f4ba8af927b46c50ce1e4f993cffd3cebde9884ec484cb
+DIST compiz_0.9.12.2+16.04.20160714-0ubuntu1.diff.gz 118198 SHA256 f11e14437179ce94c9e9924840df1540c078c19f4bc40ab96c8999b95862a962 SHA512 ff99e6de5e5edf2e2825908e1fdfa0a1b232fbcfb92c70d4ddf4a5da1dc1f3489e68e7988534eaa98683d151f14ab980d3b662dc87aaccb997c5ee6a35251b99 WHIRLPOOL 77d9285e28bccc3a350c9a5a2ec96b909130136d88a4b6234f62b647bcce0762ef3929b595027f66a1c38286803fda3901b090cc245ee56f7c3d1be75dd8fa79
+DIST compiz_0.9.12.2+16.04.20160714.orig.tar.gz 5571674 SHA256 c00425284cbb1d4dbf37c17553bf8774602598cdcc42e10d2b8a374c232d27be SHA512 7d72f0312dd1c846120766a6d15374ec53a8a11c34afd4e25b7596c2f6780ce5a035b3bd97ebfbd217da5fabe864b4234fedbe0d3bef535e4a3f21619f0b4de7 WHIRLPOOL 04f9a035b29d8a86887afee471329bea55faa8446e30fca4cfcebf57a29bf6f4fc12f91c886816414ae070df0e0ad5dbf0fe83b5ad2f6fa3a5f55085d0a66ed5
+EBUILD compiz-0.9.12.2_p0_p01_p20160714.ebuild 7345 SHA256 85585258de40f86100aee509462abb1ccdecbec4183ad9f2ddeab18f97e3cdc6 SHA512 1e0956a0fc5fb592d98ecb0f313ec0e8be611766cb116065ad9a66d8dda94e72a573e3ea79f5759c8f64d7991cd3e6720faf794fc677ef3a483c0dd4d19ab849 WHIRLPOOL 1d151dcaae1602c8d630047024e13c8bbf8b22ca045220787daecfc6ed93a78a9e2b83bb54b59ee544c69997c7929bb9699f33c8ca499c61c089e1f99a76ae9a
 MISC metadata.xml 362 SHA256 81909e6f96cd35fc7a97a5c9f1669292ff98d12690a7274920e7b8ed31ed02b7 SHA512 74e11b5a19cfe8aa9ed40021a7661aee3abec911b321ea75630d2e6799a4420e4251faef690d3296f689b17a03dc9aad89df56cfd064d84e824d712d3232efe8 WHIRLPOOL 0e8df343ad1219a4269fe1ba0cba1edf07c331e7e83800236294f4d1e7c9d88dfc0073674068f591d80e464389caa50099260f132b52f2b4d4168aa8fbeb4215
diff --git a/...z/compiz-0.9.12.2_p0_p01_p20160526.ebuild → ...z/compiz-0.9.12.2_p0_p01_p20160714.ebuild b/...z/compiz-0.9.12.2_p0_p01_p20160526.ebuild → ...z/compiz-0.9.12.2_p0_p01_p20160714.ebuild
@@ -149,8 +149,8 @@ src_compile() {
 	# Disable unitymtgrabhandles plugin #
 	sed -e "s:unitymtgrabhandles;::g" \
 		-i "${CMAKE_USE_DIR}/debian/unity.ini"
-	sed -e "s:unitymtgrabhandles,::g" \
-		-i "${CMAKE_USE_DIR}/debian/compiz-gnome.gconf-defaults"
+#	sed -e "s:unitymtgrabhandles,::g" \
+#		-i "${CMAKE_USE_DIR}/debian/compiz-gnome.gconf-defaults"
 	sed -e "s:'unitymtgrabhandles',::g" \
 		-i "${CMAKE_USE_DIR}/debian/compiz-gnome.gsettings-override"
 
@@ -202,9 +202,9 @@ src_install() {
 		insinto /usr/lib/compiz/migration/
 		doins postinst/convert-files/*.convert
 
-		# Default GConf settings #
-		insinto /usr/share/gconf/defaults
-		newins debian/compiz-gnome.gconf-defaults 10_compiz-gnome
+#		# Default GConf settings #
+#		insinto /usr/share/gconf/defaults
+#		newins debian/compiz-gnome.gconf-defaults 10_compiz-gnome
 
 		# Default GSettings settings #
 		insinto /usr/share/glib-2.0/schemas
@@ -220,14 +220,14 @@ src_install() {
 	rm -rf "${ED}usr/share/locale"
 
 	# Setup gconf defaults #
-	dodir /etc/gconf/2
-	if [ -z "`grep gconf.xml.unity /etc/gconf/2/local-defaults.path 2> /dev/null`" ]; then
-		echo "/etc/gconf/gconf.xml.unity" >> ${D}etc/gconf/2/local-defaults.path
-	fi
-	dodir /etc/gconf/gconf.xml.unity 2> /dev/null
-	/usr/bin/update-gconf-defaults \
-		--source="${ED}usr/share/gconf/defaults" \
-			--destination="${ED}etc/gconf/gconf.xml.unity" || die
+#	dodir /etc/gconf/2
+#	if [ -z "`grep gconf.xml.unity /etc/gconf/2/local-defaults.path 2> /dev/null`" ]; then
+#		echo "/etc/gconf/gconf.xml.unity" >> ${D}etc/gconf/2/local-defaults.path
+#	fi
+#	dodir /etc/gconf/gconf.xml.unity 2> /dev/null
+#	/usr/bin/update-gconf-defaults \
+#		--source="${ED}usr/share/gconf/defaults" \
+#			--destination="${ED}etc/gconf/gconf.xml.unity" || die
 }
 
 pkg_preinst() {