Add dependencies for oxygen-icons (bug #528676) and virtual/ttf-fonts, as they are...

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

diff --git a/lxqt-base/lxqt-meta/ChangeLog b/lxqt-base/lxqt-meta/ChangeLog
index 65c225c057d912ce3cd7897c558c72df9ce05a1f..30e4531aebc8ea33bfad7ad341cc9e981390436d 100644 (file)
--- a/lxqt-base/lxqt-meta/ChangeLog
+++ b/lxqt-base/lxqt-meta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for lxqt-base/lxqt-meta
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxqt-base/lxqt-meta/ChangeLog,v 1.9 2015/02/20 11:47:51 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxqt-base/lxqt-meta/ChangeLog,v 1.10 2015/03/15 03:16:22 yngwin Exp $
+
+*lxqt-meta-0.9.0-r2 (15 Mar 2015)
+
+  15 Mar 2015; Ben de Groot <yngwin@gentoo.org> +lxqt-meta-0.9.0-r2.ebuild,
+  metadata.xml:
+  Add dependencies for oxygen-icons (bug #528676) and virtual/ttf-fonts, as they
+  are expected in the default install.
 
 *lxqt-meta-0.9.0-r1 (20 Feb 2015)
 

diff --git a/lxqt-base/lxqt-meta/Manifest b/lxqt-base/lxqt-meta/Manifest
index 9a01e25074865d13adebdaad75d5b771e63f5179..afd09d76c1c72323497f910821294f988209c048 100644 (file)
--- a/lxqt-base/lxqt-meta/Manifest
+++ b/lxqt-base/lxqt-meta/Manifest
@@ -4,25 +4,26 @@ Hash: SHA256
 EBUILD lxqt-meta-0.7.0-r1.ebuild 1523 SHA256 2ca50b8679e3700d26a9b9a924f8837bf80f8d54a90032b19ee6bca8b44ee02a SHA512 48255c1ae0a02d8bf8c7c3d2589604c644707b4f073a20195fed4e13b1aab1333ae14e81e648d5cf06ef3b884865db234b913149aa112e0076f2306483c947d8 WHIRLPOOL b158a187c1f5369ce541725819dc703c68786373bddb96c91c86a564d4bb65be118198b084364bddf195c89718a335c5beec220af9527702d2ef3e94f578da9d
 EBUILD lxqt-meta-0.8.0.ebuild 1332 SHA256 e22b3c1d0959a179410aa04f32582da7bb5582a9810e37a4b3e2e82e695ce418 SHA512 d22462f4cc6e05233136653ba5af9ae672657d5e8d1f88fab47ae69edb386c82c39c215b6a2776f376f90f36c04718731d310f18a76c2b36f415c88cc0f40f2a WHIRLPOOL 184add1ca972ae1b8eeceade4a86130c46f35447b874b4ef2c1aed5421de2add0f62673c613aa2ae0e6e5c203f0308b360fdfba9b42032ad0713bc830a30ae56
 EBUILD lxqt-meta-0.9.0-r1.ebuild 1376 SHA256 90eba10b398a86cc1e2994d03f1a38281d49281cbe3aad581f42fc705ad3aa66 SHA512 e4f73630dcbaa7e597a1910cff985f1a42a43550d0a58b036c1cc15f61853cd3ee8103f0c15876dd466410a82f6c288fc2dee360a98d065b16d2c5cf938c1731 WHIRLPOOL 2e0d9ca4c93d0ed4684a8f967ef3b55a6c221fa0e6fa7e736ac65f8e1e4a6d967d4326e3c6fcbe04905d589fbe038ccef7c2ab3f79b2c1cc8963737efe0ec012
+EBUILD lxqt-meta-0.9.0-r2.ebuild 1620 SHA256 51c72e8d5c15f773f39b2b38ce04c995c699243b18e92589cbd709bf79719871 SHA512 660b86ef4af9369bda596e2840170b6289d768428cdf43c03706d5eeddeab8ce5768979ae71e6199e696fec361daadf577f2253e068f1656cb15102532729601 WHIRLPOOL 63952459e83997885dc84d6833e4dcc5f7546176f7f91c77a46d7a6889f2dd70c70f7a1eeebdd10172282f946cd09c2a36837ccbce27f5e16fbd64769ff286de
 EBUILD lxqt-meta-0.9.0.ebuild 1374 SHA256 fa7137903580cb4a6030bc97f92a1280a49095f4ed61e6f350c6c806bce6f64b SHA512 db75ed85d111b777230253577a29c3ca51267154f777fcd4d4ce3a285c1077793aba1cc6442623f745e2dda806fba1b247ffaed21f1ebd3b0fcad44e6276beb1 WHIRLPOOL 0778d124dde748f94bc0268cafee793143ad8fc3ef9ce3fe1da25703fea68f4c5d3e7f13285d881b15f6960e36a121db780cd3d368703c8250fe48198d255e6c
-MISC ChangeLog 1705 SHA256 003f4f1400b4545943b5a91fb8d721ba122fc97f5dbc7766e970eaa94f09aa98 SHA512 d21c8a1b36d985e091ff9f7bc7e1c1e8945ef29a768d8bd4973c8bc59aefd2c245d618212aef77798614b83897314c99c61bcee1b4cdede208f26ba63c39c0c4 WHIRLPOOL e5a2085ee629c4e8b7532799453dd6fce536d55158e8ca540bc654cfd44d013926a5005fed37c8b460aec6362410d381624153be92db00f4aeb43058dcdb14db
-MISC metadata.xml 1032 SHA256 3ab0033ac55520f07476785389bd2a724f95bca42bcaf0b7738be238dc3c29d8 SHA512 a6a3cd776547247eac432bc2db2f497a064a216af97830ff80d3d155b65263799e0a8278233c7f2417fdbe8fcb33a0d15c2c4849b604e7c151086cab4d55fd1a WHIRLPOOL 12c0efcb265c0b430bf566b4b359541bcea38ca00aafb945d9d57dd1f3eb26962e5ca7898881c9c707711933bfb7c7bf85685e667bf9ea8f946c3082b197d20f
+MISC ChangeLog 1954 SHA256 1a227a6eff532d4da0136905e3e051c6ab7d393cf8d3436255d03ad247cb283c SHA512 0fc3174faa8e591c1587b9c2c1b5de2ff9ab5f2c4e2bc9c284c8bafa4719bcacb59696bcaa820093cdbfd81cbdb57e1d50f4c2bfa434a7540af0e064f348343d WHIRLPOOL d6b09eeecfac4311048fe0446432924dc4c19527bf7a24d08b15e621414ed2635949d5adc3b41a92534fae8c28f0b2b59c414b8d29064ed214f36cacbabec5bb
+MISC metadata.xml 1039 SHA256 05df274e78bb50c16dfc1c7d469c18f4ec80782cd6758f2e5ec72631bacaf478 SHA512 8b7e71832c169e0f73ade0190bb661f455b548e4d738bfe3653efae6bde34db78bdaf81dd7ffcd8807d0179f119c58e0bd1da02cf6530dea2956d8dcca290196 WHIRLPOOL 5bbaca1dae4b6a86a65ac84a8711f7f7653b35a051ae791f3330549a07c7dad4ed2967f6b839faa4f1f3c99f54f9e4126ea1e11bca646438f4398aa2e7cfcdf8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU5x7oXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVBPmNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFO9kkP/AyRfmNVCioE3Bd5M+qobnRM
-JO39FKNjWR9ZrbXxMo+95dvacZ+6evvyUc0TVek2IQsHHvOgQd3tgdafz5O6dVJL
-EkmI7zSUtz4kM61SnkWuqAXavV9wWmA5f+om/ZJXAZqr86gKMhDpDxHUN9POXAbp
-ZzzVnx/BFH/Pi0QaoVlUm3r5Omd8ADAfH7nfi0s1sxY4aTOuV440aV1ZrZq8CKoS
-fioDGYiLLgD8xcSvSoOMnPrLJNiN77bH7YTGHCJYSMv2w0G9+5UfylBzDSLH4glz
-0l/iVstN0mcbwCbbg5UOJTTNO7Zrlp+mF6VI+sfC+Tbku9TfCQW6o4M4lU0vnQh3
-u1eb2BnshF7y4FCVuhUvQ/jSx1tmPr6jFqPrbN4LZLFQP3w9BiShhrHxrknkvXbL
-aiqwFJQAno4b906vPOVgTEuh6SbCni3CvI1WNr0P9pcZczdU3KbnZXrpbHQkZ7zM
-lZhRCktNjISX25Wuc//TSHlLLvf3QehoApWZiWL4lVLbD7GjIIKQqhomrNeXZ2A3
-sa/8+X6HDYcwl6xy1h1qsFg7zMxi7hQtDaSkiB1zg+xlThiiZ1UtWHdMjw21UAxw
-TGFSb6K/7ZfTKod530OLsWRIrTMT2yMPQuTF4nO4PRHC5kWHskGBS2/JZU29UfKC
-pak1kh0m3xY2UNr9GhvY
-=sLRn
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFO6tAP/2NvwhgjrrpNE9vK1CwHjrq+
+JU3mTwym/2T9lbbZCkiiYVXpmNZTi33ldSpkNEa0GrLEE7UbgYcMz8iwRsU7o96o
+KvdGrQStu8X+OlHsFCUH+4YiSxsCetyebx1Xo3m0N4yQ08tG5ttRil0QmCT6/T/a
+tvmeRYzYkZBxO+e83YpzCA/8lTJlykl3ezqHpRSK3klENZw85WawObZFDY1CWCq+
+6S6N3d9BRP9jcT4zmsdXBU3xSljrfLMVm1a4ViOM99fBpYy6YfBbouTE7ICupAm4
+3I2Gwpu/0TQIpkXSSSyP2hco6BH1zw4Xad6/V8gjfpmYSvEQiQANBekT7VYZ1MmL
+MttFg+HJd5Tq1nQ159XM4xzVsNib4iTGQsHYezRpqXLIh0nTJy8U86b5k0+02wGT
+ZR8FE4u6q4hEQKIWTKZldMIR80Xu4cdgkY/Kr1OyeE/5ZA7LAHRk+loDRuKno2eJ
+qQZhllfXl/QS7LVDr3X4d5b8fTV9heBMg3O6g3JemeXJT6N1A2J7wI+ghyyr1AbR
+EC0wJKLLggsmrfx7niUffAuyw79AW/P7Ir/2cg4WxPJ9rGlsyUJwrj+M7stvG/WM
+AdhmMVFyLVCQjj3xBIfcwgvEUhbeT2z7g5xFgGXgLQeYinNgYA7hyOmT2Y6j3ria
+R4qH1+YRQ4OUYVF2X7Sw
+=G6hh
 -----END PGP SIGNATURE-----

diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.9.0-r2.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.9.0-r2.ebuild
new file mode 100644 (file)
index 0000000..88f5bec
--- /dev/null
+++ b/lxqt-base/lxqt-meta/lxqt-meta-0.9.0-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/lxqt-base/lxqt-meta/lxqt-meta-0.9.0-r2.ebuild,v 1.1 2015/03/15 03:16:22 yngwin Exp $
+
+EAPI=5
+
+DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment"
+HOMEPAGE="http://lxqt.org/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="admin +filemanager +icons lightdm lximage minimal +oxygen +policykit
+       powermanagement sddm ssh-askpass"
+REQUIRED_USE="oxygen? ( icons )"
+
+RDEPEND="
+       >=lxde-base/lxmenu-data-0.1.2
+       ~lxqt-base/lxqt-about-${PV}
+       =lxqt-base/lxqt-common-0.9*
+       ~lxqt-base/lxqt-config-${PV}
+       ~lxqt-base/lxqt-globalkeys-${PV}
+       ~lxqt-base/lxqt-notificationd-${PV}
+       ~lxqt-base/lxqt-panel-${PV}
+       ~lxqt-base/lxqt-qtplugin-${PV}
+       ~lxqt-base/lxqt-runner-${PV}
+       ~lxqt-base/lxqt-session-${PV}
+       virtual/ttf-fonts
+       admin? ( ~lxqt-base/lxqt-admin-${PV} )
+       filemanager? ( ~x11-misc/pcmanfm-qt-${PV} )
+       icons? ( oxygen? ( kde-base/oxygen-icons )
+               !oxygen? ( virtual/freedesktop-icon-theme ) )
+       lightdm? ( x11-misc/lightdm )
+       lximage? ( media-gfx/lximage-qt )
+       !minimal? ( x11-wm/openbox
+               x11-misc/obconf-qt )
+       policykit? ( ~lxqt-base/lxqt-policykit-${PV}
+               || ( sys-auth/consolekit[policykit(-)]
+                       sys-apps/systemd[policykit(-)] ) )
+       powermanagement? ( ~lxqt-base/lxqt-powermanagement-${PV} )
+       sddm? ( >=x11-misc/sddm-0.10.0 )
+       ssh-askpass? ( ~lxqt-base/lxqt-openssh-askpass-${PV} )"
+
+# Note: we prefer kde-base/oxygen-icons over other icon sets, as the initial
+# install expects oxygen icons, until the user specifies otherwise (bug 543380)
+
+S="${WORKDIR}"

diff --git a/lxqt-base/lxqt-meta/metadata.xml b/lxqt-base/lxqt-meta/metadata.xml
index 997bb1f86f7d87c2f59c612a692a1738b6e5106d..7bd978785a842b44ef6e41dec25534e9fa91df93 100644 (file)
--- a/lxqt-base/lxqt-meta/metadata.xml
+++ b/lxqt-base/lxqt-meta/metadata.xml
@@ -6,14 +6,14 @@
     <flag name="admin">Install <pkg>app-admin/lxqt-admin</pkg></flag>
     <flag name="filemanager">Install <pkg>x11-misc/pcmanfm-qt</pkg>
     file manager</flag>
-    <flag name="icons">Install <pkg>lxde-base/lxde-icon-theme</pkg>
-    icon theme (pulls in <pkg>x11-libs/gtk+</pkg>)</flag>
+    <flag name="icons">Install an icon theme</flag>
     <flag name="lightdm">Install <pkg>x11-misc/lightdm</pkg>
     display manager</flag>
     <flag name="lximage">Install <pkg>media-gfx/lximage-qt</pkg>
     image viewer</flag>
     <flag name="minimal">Do not install <pkg>x11-wm/openbox</pkg>
     window manager</flag>
+    <flag name="oxygen">Prefer <pkg>kde-base/oxygen-icons</pkg> (default)</flag>
     <flag name="powermanagement">Install
     <pkg>lxqt-base/lxqt-powermanagement</pkg> package</flag>
     <flag name="sddm">Install <pkg>x11-misc/sddm</pkg>