gentoo resync : 31.10.2017

5 files changed, 26 insertions, 121 deletions

diff --git a/sci-electronics/pulseview/Manifest b/sci-electronics/pulseview/Manifest
index a936c294702a..4c5a6d0e28e9 100644
--- a/sci-electronics/pulseview/Manifest
+++ b/sci-electronics/pulseview/Manifest
@@ -1,11 +1,7 @@
 AUX pulseview.desktop 210 SHA256 b7644de38545758fd35b2c20295a85ed9d209da34965d7038946ed29381d3a87 SHA512 1a40fc25562ecada2b786606ffa873625fa25e7e142fd2b4081230cbfbaef94adb1076bc306d1c3bbbf226b1786c91b43d447d7d7d6ac46d7bf4faeb1f843dbe WHIRLPOOL a7be4e8995cf4649d7e173dbc9f076c1e44cb33188a068568efb6bb98758dfb202bc0ba5f75489f24d241b22ffadb5f7079518a47d3f795668d5cdb2a9b80ded
-DIST pulseview-0.2.0.tar.gz 148799 SHA256 feb5d33a0a91c989bfc39fa758195755e78e87c3cf445bb135a8c8d4f86bc1dd SHA512 f770510ceade6382de2d09ba7819a9b39623f3ccbbb4a3a64bb0a64f774d356583f6ad2812a845978d1eaf50dcbfd4688ceec3005d0b712a087d1f686d3c0301 WHIRLPOOL 31068fcebd4286d325db37327c351e8cbd00e095901c04a3d034c127b1272e7c463400a91683cbb64a775b86f5cf61411f1f809e7b4dcd76113ceeb63990eaa2
-DIST pulseview-0.3.0.tar.gz 188602 SHA256 5ffe2cb7a602fcdc60933d400c77bcd66e6ce529bc4f6e97d6a5e5a86f2f530e SHA512 81c509ef3e548ab8ff29633a07c280cee1fba5cc94db7fc1fbc64822eccb905ab5fb4126392cabe0c089e51896a02e0fbc6c0f265bf728cee6ac6651c3ab883a WHIRLPOOL f23f420ab2d0083a234eff5d757fac0ebbfbe97670bf229292fb91d7f3ba6f3a37c7716bbece607b6593133da41ac103cfcfb4f46986ba6bc243d379fb4413dd
 DIST pulseview-0.4.0.tar.gz 226656 SHA256 78f8291045c6f65b4827b12e83c8e68cea2d5e7268b15a51aaca9726c8100eb9 SHA512 833a86681925fb4fb2118bb9d0044fc80174aef299b7e6ba2df83bff490511b91cd18f63f45e9a63f21c0df5d8aad3ec27ab35f45cd9959a42831b0b8a71da33 WHIRLPOOL bc2c97049e20ffcdc026fc0e33597be2ac1a213782a2fd9abaf7d8f0751b204d73ebbe5de16df4b4854ebfaddeabdf9e0b3d2e72ac8eb906b6397634f0efa926
-EBUILD pulseview-0.2.0-r1.ebuild 989 SHA256 12db0e979546155ce3875a5dd1b37c10a5a5cf26e8fd38e62c9d2b9ddfcf315f SHA512 8c7d196410161d227d8bf20f48c4f80df542f2b7756d008803b51c60fcac5d63cb4920466650501e5c0f57524ab56a149b5564433a64b8ff4720e58e889dbb27 WHIRLPOOL 440cdfeed597a7e0e34e2cc8bba8b5394e15dde3830ac3b5ca01708ee52cd63e3c0ef64cb056d57d3d1c192036c894a7ecb7a0c4f22386e697f524635e80b7b5
-EBUILD pulseview-0.3.0.ebuild 1362 SHA256 16d5290995173c600ad80310abefa2cc1c7bc88e5b1b22927a11534f24c40896 SHA512 0507d82b55e7e175dfa2c89becb8181ea37e50e63ffb8395ea7fe345033db782fce8617ee8ec0f2de09fc43a1009b914da03355bdcde7b3b483090128f5a9cb0 WHIRLPOOL 7201550033b2f333215aba4eaa7174d5532a19acbc106ea1886dce50ac634904b45cff8e5792796b5fef6db9eba2d05e53e47c1ed506a384873ae5b70a8fbdf5
-EBUILD pulseview-0.4.0.ebuild 1082 SHA256 4160b5719535ba9015811c0d9d2e36bdaf013b5ddbb7a91864fc8f0e1c9c49a7 SHA512 b44295dfb3729889db5a31ce9be0e623f9f2ca3b9e156dc870e666709751e26bae12c722e3139bd35f81155435055506f8fe19f1ff9d3d692c161f9921bf97e3 WHIRLPOOL 506cbd16570bb5e502af4ea512c0b6703380f495455194a400a9eb058c86d4df42254f94ab6e9cac1131eb3d7e660b4c3283c9ba892e337c9de76851b0c53c72
-EBUILD pulseview-9999.ebuild 1082 SHA256 4160b5719535ba9015811c0d9d2e36bdaf013b5ddbb7a91864fc8f0e1c9c49a7 SHA512 b44295dfb3729889db5a31ce9be0e623f9f2ca3b9e156dc870e666709751e26bae12c722e3139bd35f81155435055506f8fe19f1ff9d3d692c161f9921bf97e3 WHIRLPOOL 506cbd16570bb5e502af4ea512c0b6703380f495455194a400a9eb058c86d4df42254f94ab6e9cac1131eb3d7e660b4c3283c9ba892e337c9de76851b0c53c72
+EBUILD pulseview-0.4.0.ebuild 1253 SHA256 4773c46cc6199feba096dbb2f4468445b6664f83145b319e80354916b7d21eea SHA512 c20fb70c415231eb2e8ee90f1d25515beb27e54671fd7ff58f12e4a9432da97e79ccadb642f5850aaba57799bf64434f8664ff1d883040241a2f4b72c1580c65 WHIRLPOOL e1da3305e46fc651ff17368c85ff016f6beec28efaaf03cab01075acd46079497f40c2d439450454de6f25d8eea2f7f415fb154bda01e7dfc9cbc76b9a9b6fe9
+EBUILD pulseview-9999.ebuild 1253 SHA256 6ddfad3ce0cd9f618bb2d607575b48969034df61378253e51de545aa1532bd38 SHA512 4e91e05518f10fb1734af5f36394ebaad4e526b61de7af4be4aa5565e845c0f2fb23888f4e35033adccfe34f55f175ea969e4d1ab6341fe1d22129a22d6d6c97 WHIRLPOOL 4d8d2b6a3835ced106551076741b35d17ce897a899a5f898be8aaedb5106d7aeb6913b93a2b4fab504f07fce270743769bb2e854c60fb939b6e3cfbde4d7e2e6
 MISC ChangeLog 4674 SHA256 16d19f711f014103566ae90d1737b7e876bacaf96fdb0e864f0bbc8552400c2c SHA512 332b5f4aa2a670944a0f4f19c807a190957e15e1e9797d1005789d69b405af7e7f7450e7b80f112824b5f4c4f7d9e7142b001423f5142644dedccd8b965763d3 WHIRLPOOL 6376bb00cd0865caaadcd20bb38451a9e2890a0856aa1679d6d6a1e5ec5a813ce7ca40f5cb3bb8b510fd7124b8c678495253fd190a816118b4865a48b580e827
 MISC ChangeLog-2015 612 SHA256 34a1acd02acbcd88954bd33cea4f98d95384bc9cb8447e824143812bba8280e4 SHA512 a2783a2152b2c5173e9bd0425bc0bd69a82d8351b249fecf4666b390ffa99a3804c221b0fcd8aeb8c21502f1c1a2c604f200db3eb210d70ae383ad84d40cb9a9 WHIRLPOOL 2b25a0919f97d579f0072a91f8239770e9287a1297e4a29190b6a03e381a8a1d2bc4850b2204b0cfa87edb6246c25f06bf92e15649f7a5afd5ff5a4114bb0b3c
 MISC metadata.xml 333 SHA256 bab5b30e3a98f2cd8adff0ca490dae46c8e6a28e210492f61f07ce0c9dcef674 SHA512 f7f0484072e7c2486a176c29814d7a390d8e44d01593d75ed51231e5c67e7226e576da17410da01281b16ed31361c1724e60026d7df06b580e29901a3f89d2dd WHIRLPOOL 7d15dfae31e76b9a54b82c353305534b329eb52a35bc90958a841ee624d1c3c9d86b53197616d9184c368350215a2d178f6ddcc678d1045a8dea708fa2e341c8
diff --git a/sci-electronics/pulseview/pulseview-0.2.0-r1.ebuild b/sci-electronics/pulseview/pulseview-0.2.0-r1.ebuild
deleted file mode 100644
index fe1305f53858..000000000000
--- a/sci-electronics/pulseview/pulseview-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_4 )
-inherit eutils cmake-utils python-single-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
-	inherit git-r3
-else
-	SRC_URI="http://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Qt based logic analyzer GUI for sigrok"
-HOMEPAGE="http://sigrok.org/wiki/PulseView"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+decode static"
-REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/boost:0=
-	dev-libs/glib:2
-	>=sci-libs/libsigrok-0.3.0
-	dev-qt/qtgui:4
-	decode? (
-		>=sci-libs/libsigrokdecode-0.3.0
-		${PYTHON_DEPS}
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( HACKING NEWS README )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_WERROR=TRUE
-		$(cmake-utils_use_enable decode DECODE)
-		$(cmake-utils_use_enable static STATIC_PKGDEPS_LIBS)
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-electronics/pulseview/pulseview-0.3.0.ebuild b/sci-electronics/pulseview/pulseview-0.3.0.ebuild
deleted file mode 100644
index df2fbb1b3c01..000000000000
--- a/sci-electronics/pulseview/pulseview-0.3.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit cmake-utils python-single-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
-	inherit git-r3
-else
-	SRC_URI="http://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Qt based logic analyzer GUI for sigrok"
-HOMEPAGE="http://sigrok.org/wiki/PulseView"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+decode qt4 qt5 static"
-REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} ) ^^ ( qt4 qt5 )"
-
-RDEPEND="
-	>=dev-libs/boost-1.53:=
-	>=dev-libs/glib-2.28.0:2
-	>=dev-cpp/glibmm-2.28.0:2
-	>=sci-libs/libsigrok-0.4.0[cxx]
-	qt4? (
-		>=dev-qt/qtcore-4.5:4
-		>=dev-qt/qtgui-4.5:4
-		>=dev-qt/qtsvg-4.5:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtsvg:5
-	)
-	decode? (
-		>=sci-libs/libsigrokdecode-0.4.0[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( HACKING NEWS README )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_WERROR=TRUE
-		-DENABLE_DECODE=$(usex decode)
-		-DSTATIC_PKGDEPS_LIBS=$(usex static)
-		-DFORCE_QT4=$(usex qt4)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newicon "${S}"/icons/sigrok-logo-notext.png ${PN}.png
-	domenu "${FILESDIR}"/${PN}.desktop
-}
diff --git a/sci-electronics/pulseview/pulseview-0.4.0.ebuild b/sci-electronics/pulseview/pulseview-0.4.0.ebuild
index e7a4a92ef4c7..0b7e367cae17 100644
--- a/sci-electronics/pulseview/pulseview-0.4.0.ebuild
+++ b/sci-electronics/pulseview/pulseview-0.4.0.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 PYTHON_COMPAT=( python3_{4,5,6} )
 
-inherit cmake-utils python-single-r1
+inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -49,3 +49,13 @@ src_configure() {
 	)
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/sci-electronics/pulseview/pulseview-9999.ebuild b/sci-electronics/pulseview/pulseview-9999.ebuild
index e7a4a92ef4c7..bb4428d95b8c 100644
--- a/sci-electronics/pulseview/pulseview-9999.ebuild
+++ b/sci-electronics/pulseview/pulseview-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 PYTHON_COMPAT=( python3_{4,5,6} )
 
-inherit cmake-utils python-single-r1
+inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -27,13 +27,13 @@ RDEPEND="
 	>=dev-libs/boost-1.55:=
 	>=dev-libs/glib-2.28.0:2
 	>=dev-cpp/glibmm-2.28.0:2
-	>=sci-libs/libsigrok-0.5.0[cxx]
+	>=sci-libs/libsigrok-0.6.0[cxx]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtsvg:5
 	decode? (
-		>=sci-libs/libsigrokdecode-0.5.0[${PYTHON_USEDEP}]
+		>=sci-libs/libsigrokdecode-0.6.0[${PYTHON_USEDEP}]
 		${PYTHON_DEPS}
 	)"
 DEPEND="${RDEPEND}
@@ -49,3 +49,13 @@ src_configure() {
 	)
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}