Merge pull request #19 from linxon/master

Update ebuild syntax (Fix menu bar bug #13738 for v1.11)

app-editors/brackets-bin/Manifest

@@ -4,3 +4,5 @@ DIST Brackets.Release.1.11.32-bit.deb 63152608 SHA256 5e0dc291d49da4924f8b694bd9
 DIST Brackets.Release.1.11.64-bit.deb 62141800 SHA256 178827dd0a542656df611e065593e091f5c6bd0351df199245b571022b3abeb3 SHA512 5a09977c1cf8f7496f6d8f4e3b01ce9eb02819e0c42071706ef8ef0185009b825f04f60f5354801dc74df2ab525791d701eb193e8c8ccc70de7504068028285d WHIRLPOOL ee560299d807d1911839fd52e2808bad89fc317d684ddbd983a9d5ee9f8029376b113cef5ab06b8ef7ba129e177e789c8dabf008fa171a52a2e9a51d0d58cbfa
 DIST Brackets.Release.1.7.32-bit.deb 32793200 SHA256 a278264a0b4f68aa2220b2c052aa1ebf388aa512ef767e85f3f9935a6500e6c8 SHA512 c4fd1067f3798f5831c5724c0eac85ba5eb91aea88f46687fc9dc18596811cdb44841689cfa68b0ffb08069ffd80c78df8298fef264cdc4d5fc7798aecf06ab4 WHIRLPOOL b10ac45d5c0edec91d147576bb397daee6c09d3e618f6710a520396457e5f2988027bb0951c378c4da9edd66e9c74a7ff7423f28d9f46518846d166dc10e49f9
 DIST Brackets.Release.1.7.64-bit.deb 34333856 SHA256 15496b5ec592489720bbb5e4af6d9fc7803fc3364ec70a54382da3bbdff0515b SHA512 78b69c65ccc3065bddcf046ca56713230e3190101978b1561db00437e53d798f4dbd3a92a1114d9e9cf1cc2fc6d772797e7a07b5d2ff51dacdf3e50eb203617c WHIRLPOOL 005c25655a5483146c3d2bffe52ab8f4e41570f1aeb8a5513c681890f77bcef59437c69e865ed7806846e363e5614c7f2ca0a29020b8e291885766698964d752
+DIST libpangoft2-1.0-0_1.40.5-1_amd64.deb 205064 SHA256 d668b89229869a68cc411a25feff5016ff76c5ed0ae23855196f2a46f8f88e75 SHA512 2e5bdfebb0fff138db2f0a3eb3d357619e22690ccfcb7026c68eec08ddb4a0fbd8f243e553f92bb9fb97251a753516549863e93ebaa76aeec754f5c16a8c1a97 WHIRLPOOL 2a356c62af4be73b505f9f3d842a20fac3e090e33fb69b5e8c3c0a6dde122cb21ec74470e2e7d880327e51be1a5782c1f599a2defcc6da3dab85c090feacd23c
+DIST libpangoft2-1.0-0_1.40.5-1_i386.deb 208454 SHA256 56433759becdd16be015dd35c9b1eb9428a8e7f7393c7c5952642f7ee59a84d2 SHA512 de18cb4f50873d2f1cfa863404dfda9de6a137d4112a3b7120e520e25d0432d98737b8bb17b0da7a8c464b094d6de9710a1d47201e4a7d01c09c1369ffddb6e5 WHIRLPOOL 9b4495a9f99e7e6ca0a47eee64b3d59eb115c84859994c31e3956df7fbdd9cb531cf9fbb2ffb219e3295578499906aa3640ffb5f44787db64df7f344b26dc53b

app-editors/brackets-bin/brackets-bin-1.10.ebuild

@@ -23,6 +23,7 @@ QA_PRESTRIPPED="/opt/brackets/www/node_modules/phantomjs/lib/phantom/bin/phantom
 DEPEND=""
 RDEPEND="${DEPEND}
 	|| ( >=virtual/libudev-147 >=virtual/libudev-198 )
+	!app-editors/brackets
 	>=dev-libs/atk-1.12.4
 	>=dev-libs/expat-1.95.8
 	>=dev-libs/glib-2.18.0:2
@@ -67,18 +68,17 @@ src_prepare() {
 src_install() {
 	local my_pn="${PN%%-bin}"
 	local s_libs="libnspr4.so.0d libplds4.so.0d libplc4.so.0d libssl3.so.1d \
-    	libnss3.so.1d libsmime3.so.1d libnssutil3.so.1d"
+		libnss3.so.1d libsmime3.so.1d libnssutil3.so.1d libudev.so.0"
 
 	# Unfortunately, i can't fix warning message "QA Notice: The following files 
 	# contain writable and executable sections"
 	cp -Rp . "${D}"
 
 	# Install symlinks (dev-libs/nss, dev-libs/nspr, dev-libs/openssl, etc...)
 	for f in ${s_libs}; do
-		target=$(echo ${f} | sed 's/\.[01]d$//')
+		target=$(echo ${f} | sed 's/\.[01]d\?$//')
 		[ -f "/usr/lib/${target}" ] && dosym /usr/lib/${target} /opt/brackets/${f} || die "Failed to install!"
 	done
-	dosym /usr/lib/libudev.so /opt/brackets/libudev.so.0
 
 	make_desktop_entry \
 		"/usr/bin/${my_pn}" \

app-editors/brackets-bin/brackets-bin-1.11.ebuild

@@ -9,17 +9,22 @@ DESCRIPTION="A code editor for HTML, CSS and JavaScript"
 HOMEPAGE="http://brackets.io/"
 
 SRC_URI="
-	amd64? ( https://github.com/adobe/brackets/releases/download/release-${PV}/Brackets.Release.${PV}.64-bit.deb )
-	x86?   ( https://github.com/adobe/brackets/releases/download/release-${PV}/Brackets.Release.${PV}.32-bit.deb )"
+	amd64? ( https://github.com/adobe/brackets/releases/download/release-${PV}/Brackets.Release.${PV}.64-bit.deb
+			http://ftp.br.debian.org/debian/pool/main/p/pango1.0/libpangoft2-1.0-0_1.40.5-1_amd64.deb )
+	x86?   ( https://github.com/adobe/brackets/releases/download/release-${PV}/Brackets.Release.${PV}.32-bit.deb
+			http://ftp.br.debian.org/debian/pool/main/p/pango1.0/libpangoft2-1.0-0_1.40.5-1_i386.deb )"
 
 KEYWORDS="~amd64 ~x86"
 RESTRICT="mirror"
 LICENSE="MIT"
 IUSE="live_preview"
 SLOT="0"
 
+QA_PRESTRIPPED="/opt/brackets/libpangoft2-1.0.so.0.4000.5"
+
 DEPEND=""
 RDEPEND="${DEPEND}
+	!app-editors/brackets
 	>=dev-libs/atk-1.12.4
 	>=dev-libs/expat-1.95.8
 	>=dev-libs/glib-2.18.0:2
@@ -66,24 +71,30 @@ src_prepare() {
 
 	# Fix: https://github.com/adobe/brackets/issues/13731
 	#      https://github.com/adobe/brackets/issues/13738
-
+	#
+	# You need downgrade x11-libs/pango to 1.40.5 or download libpangoft2-1.0-0_1.40.5-1_****.deb
+	mv usr/lib/x86_64-linux-gnu/libpangoft2-1.0.so.0.4000.5 opt/brackets/ \
+		&& rm -r usr/lib/ || die
 }
 
 src_install() {
 	local my_pn="${PN%%-bin}"
 	local s_libs="libnspr4.so.0d libplds4.so.0d libplc4.so.0d libssl3.so.1d \
-		libnss3.so.1d libsmime3.so.1d libnssutil3.so.1d"
+		libnss3.so.1d libsmime3.so.1d libnssutil3.so.1d libudev.so.0"
 
 	# Unfortunately, i can't fix warning message "QA Notice: The following files 
 	# contain writable and executable sections"
 	cp -Rp . "${D}"
 
 	# Install symlinks (dev-libs/nss, dev-libs/nspr, dev-libs/openssl, etc...)
 	for f in ${s_libs}; do
-		target=$(echo ${f} | sed 's/\.[01]d$//')
+		target=$(echo ${f} | sed 's/\.[01]d\?$//')
 		[ -f "/usr/lib/${target}" ] && dosym /usr/lib/${target} /opt/brackets/${f} || die "Failed to install!"
 	done
-	dosym /usr/lib/libudev.so /opt/brackets/libudev.so.0
+
+	# Fix: https://github.com/adobe/brackets/issues/13731
+	#      https://github.com/adobe/brackets/issues/13738
+	dosym ./libpangoft2-1.0.so.0.4000.5 opt/brackets/libpangoft2-1.0.so.0
 
 	make_desktop_entry \
 		"/usr/bin/${my_pn}" \