Enable svg by default for icons, otherwise depend on icon-theme. Fixes bug#446716. Remove old.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64

4 files changed, 14 insertions, 74 deletions

diff --git a/app-text/qpdfview/ChangeLog b/app-text/qpdfview/ChangeLog
index fc8c05a65af4..149fd2abdc74 100644
--- a/app-text/qpdfview/ChangeLog
+++ b/app-text/qpdfview/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/qpdfview
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/ChangeLog,v 1.30 2013/01/15 17:36:21 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/ChangeLog,v 1.31 2013/02/05 12:47:50 yngwin Exp $
+
+*qpdfview-0.3.7-r2 (05 Feb 2013)
+
+  05 Feb 2013; Ben de Groot <yngwin@gentoo.org> +qpdfview-0.3.7-r2.ebuild,
+  -qpdfview-0.3.6.ebuild, -qpdfview-0.3.7-r1.ebuild:
+  Enable svg by default for icons, otherwise depend on icon-theme. Fixes
+  bug#446716. Remove old.
 
 *qpdfview-0.3.7-r1 (15 Jan 2013)
 
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index b36d7f595179..34e6f3a50c3a 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -1,22 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST qpdfview-0.3.4.tar.gz 120255 SHA256 1b695becabf16e357097d255a0d1ba39fa490c49a19ab0741c51359946448add SHA512 72adadcf6c8078886c75e6ddcb5dd28196a081b232148253ceb0a3e684d7d4175f988f615dc1d5a1af6c8731ea7676bafbf2c4b17a1fd4308db53452914a8e2b WHIRLPOOL 35339de1a2afdd695c6ab07a3e077e02be23f96ae7910238e8469af67e3b359f083c0a62260666c45679a80b17945a09c19175cffe1bd56b0e55f644229075b9
-DIST qpdfview-0.3.6.tar.gz 318788 SHA256 a9ba3fe66adcab0fe2ccad606fa2f580e5f181cde1f7ac748614fec5987f152d SHA512 19c82fd9cb7cd1dfee9554c9da00213cb210b43c991bc72bf94d663b75a25475a6b6b85732b3521782ff217436ce5e0487cde3780d10c8be8b0e9bad8be0f5b6 WHIRLPOOL c919fcf04c92589465e0640067d116cd7e275471648ac6b9b8298b72199d82947203517517cf3b951575228de272fc4ea41b84b5105e95562d7079dabff96bb9
 DIST qpdfview-0.3.7.tar.gz 385833 SHA256 6e1a91743ca429d7d354ca5ecb5f1af73e498f9ff490e07adba29f86fe92763d SHA512 c1fe0e1a0b6db890b71003f74027e66c9daae528c444453a7280fb669ab798cbf87fbc40c9e719f1b15ad2cc06edd921e34f9b4d37b2cfd05ce4e92f120d632a WHIRLPOOL ffde6fb0dd85fe4c41e0dd9b2b6f39e3f99f5384089802baaeb174e649e100e5cdbb2bc5ef6aabbc1f7fe3d5fabbec7d42bf5a68622e7f6af011768ecd231c04
 EBUILD qpdfview-0.3.4.ebuild 1225 SHA256 a4676b74dbcca31bd48d26f5c375ea41241db9cf322c68d0a48842069a2bd587 SHA512 82e00a7e5c0538172b810e4b168b75c1dc3cff945ba2cd1993afec3941c849e990722b23ee6f7e2307f1654540dbef15605d23e62c86b31b1fefa85acc5602e2 WHIRLPOOL 42a40adb68c506bb9a620a9fab2b0ee4ff843f0b922e01d806026364266d84cbdd103d06e742fcd5fe0cc22b48772a280270cec8fb003609400d8a70be97be76
-EBUILD qpdfview-0.3.6.ebuild 1304 SHA256 0285f1a9a8624212617fe30a865908c647c79cbf947673a554c111eb29993468 SHA512 2729f041fab054329540fdf10e9eedea7bb9bcf3155822767a8ace1ebe0a8f308cc24259442d37edce0e78723c01da20d87356769ee9292f5d5ced7938233cee WHIRLPOOL d1a79a12d6083bd175d4114406d45fe898aa118ae461fe52565bf1ddc04f4faf25f23eafd1f7585d80c9cabb2cfa715f8805b12f3a5d4812a01036128fd87d47
-EBUILD qpdfview-0.3.7-r1.ebuild 1383 SHA256 64c9df26c6eae568b779f19cb95926b0050f2179108833dc069c473351811258 SHA512 21c16a0de557cfbe7f0b1e6935746a16b62433a128d32fe29ad67c55e9eb813c416615d674dff95202779f7a7e63b754b332e4900ee684be91d01a9e8f7d8235 WHIRLPOOL 1162f7c16af5f8d0c41abb02323b3191e4c90af38841a66103401cf2c8a7350c80d72cf645ce3aae8d0dffca2f81f574ddefb9ab9afeecc9caf4c5e032e91003
-MISC ChangeLog 4850 SHA256 441d0465466d85d0e71f230718e766aca6030ecad3754f15c56abdac2b7a36e9 SHA512 ae3aeb90d578f61ce16cae98a19c5e4793247788641ec432d20ef43adba83c58de2f7651521e90956ece09af64d5702038795abffaff36c7163df6c6292c18bc WHIRLPOOL c91a882ed36536c24138adff4eec5ea8cf0a4ab8ef7e0749baf7955e5d3dce1a34b8eb2165d564a46362fedde0ed36684507d37ff096221e6dfbb2e4980c8453
+EBUILD qpdfview-0.3.7-r2.ebuild 1422 SHA256 177ab7e4848657c6f5db2f23e76e677b907b3cb5689df7720fa7150d05731f8f SHA512 7ae5de9a5ab5dc9046d7783e4e7502695dd537bb65e6e43efcc5a3e539edfd1bebe36c262456c0ebc445fa8f80f5cc94aa25429b9904b0340539e9c2245120fe WHIRLPOOL 1a2b4421f8d8cd6babe86a5f432cc6d08197e74b27e40d981deacf85e5c0c306c812606bdad1aad9ddd483e25b31d79ce51518ff65c9c626a261ff89f378ef46
+MISC ChangeLog 5108 SHA256 a715a3528ebc205dfc435a989bdd17e1f120aaadf98b45881b8e55be0f94b3cf SHA512 f45ad5ef2764728399de7c08ea291b6ca5f669f837cb42f8c2354fe6717eed88fd0fe8cea36b9a610a8ed213f2bd1784f31634730b8de0cde1dc1a417bfa3edb WHIRLPOOL bdfb0459bdb139530f4ee8672b88d8960ecbfcad62997ec47eedb6427798666a6d268089911c414c921482ba6fd401a8f08b3cda01acc48a2303660b47650b8e
 MISC metadata.xml 239 SHA256 042eafec556ef46f06d0a078fb4629c43368c2efbcd1cdcb4fee58fe7321c25e SHA512 3eab68188308d5c8d076f348faf795c667f25584cfcc59f72d3a23182f8eac904704611ccbe9182c5fd7adffe107cd6dd1966d189ed3098edabc3ad2f30d831f WHIRLPOOL d44f47ea1b03ee36f38b8bedb0d5c1c02e1b597af6c66d1417bdd26aa8a9aab2ddf1120d4e7688f389993805eb2920307a56e08f3af2f4889ff1e86f9f71239f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQ9ZLRAAoJEMbwO6tnXQ0sLUUH/j4Yu6CueQ55+d20PbGMozmZ
-ai/Vl5rDQcDWVj+h1OGvobY2FIRZQO9K4pyTPoPsDjK2RC4uUCIRTr+rsIO4QyoV
-u04IDwfys1RCG+4yzWozHUf6mEwRCh8n2GvDJSC5ipXC4Pu6ievwA2sJ8Yc9jYrV
-Yx42QSAO4OnvhOMAgrKBTZHkLRgj15DMG5AyVbOxEAVnKY/tqWboP8B+1SVMd1y9
-Cssn5D2rtcNPUI3iohnTrzVZlabasorgjjRdldVLu2nUF85GTvYAbbCs7D0xG0Af
-o3h4ro0qC5dlf1uze/obkcfG2yhchbdRa7olAMthAcXzau9+CdGK/fCQfOb5Nac=
-=SQ6M
------END PGP SIGNATURE-----
diff --git a/app-text/qpdfview/qpdfview-0.3.6.ebuild b/app-text/qpdfview/qpdfview-0.3.6.ebuild
deleted file mode 100644
index a2865167a15f..000000000000
--- a/app-text/qpdfview/qpdfview-0.3.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.3.6.ebuild,v 1.1 2012/12/05 11:28:15 kensington Exp $
-
-EAPI=5
-PLOCALES="ast ca cs da de el en_GB es fi fr he hr it my pt_BR ro ru sk tr ug uk zh_CN"
-inherit l10n qt4-r2
-
-DESCRIPTION="A tabbed PDF viewer using the poppler library"
-HOMEPAGE="http://launchpad.net/qpdfview"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV/_}/+download/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cups dbus svg synctex"
-
-RDEPEND="app-text/poppler[qt4]
-	x11-libs/qt-core:4[iconv]
-	x11-libs/qt-gui:4
-	cups? ( net-print/cups )
-	dbus? ( x11-libs/qt-dbus:4 )
-	svg? ( x11-libs/qt-svg:4 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( CHANGES CONTRIBUTORS README TODO )
-
-S=${WORKDIR}/${P/_}
-
-src_prepare() {
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_configure() {
-	local config i
-
-	for i in cups dbus svg synctex; do
-		if ! use ${i} ; then
-			config+=" without_${i}"
-		fi
-	done
-
-	eqmake4 CONFIG+="${config}"
-}
-
-rm_loc() {
-	einfo "Removing ${1} localization..."
-	sed -e "s;translations/${PN}_${1}.ts;;" \
-		-i ${PN}.pro || die "sed translations failed"
-	rm translations/${PN}_${1}.{qm,ts} || die "rm translations failed"
-}
diff --git a/app-text/qpdfview/qpdfview-0.3.7-r1.ebuild b/app-text/qpdfview/qpdfview-0.3.7-r2.ebuild
index 3304e1fb9af4..873325b7331c 100644
--- a/app-text/qpdfview/qpdfview-0.3.7-r1.ebuild
+++ b/app-text/qpdfview/qpdfview-0.3.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.3.7-r1.ebuild,v 1.1 2013/01/15 17:36:21 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.3.7-r2.ebuild,v 1.1 2013/02/05 12:47:50 yngwin Exp $
 
 EAPI=5
 PLOCALES="ast bs ca cs da de el en_GB es eu fi fr he hr id it ky my pl pt_BR ro ru sk tr ug uk zh_CN"
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV/_}/+download/${P/_}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cups dbus sqlite svg synctex"
+IUSE="cups dbus sqlite +svg synctex"
 
 RDEPEND="app-text/poppler[qt4]
 	x11-libs/qt-core:4[iconv]
@@ -21,7 +21,8 @@ RDEPEND="app-text/poppler[qt4]
 	cups? ( net-print/cups )
 	dbus? ( x11-libs/qt-dbus:4 )
 	sqlite? ( x11-libs/qt-sql:4[sqlite] )
-	svg? ( x11-libs/qt-svg:4 )"
+	svg? ( x11-libs/qt-svg:4 )
+	!svg? ( virtual/freedesktop-icon-theme )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"