Sync with 2.0.3_p* ebuilds

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

diff --git a/x11-misc/obconf/ChangeLog b/x11-misc/obconf/ChangeLog
index 58168be6c542a6d4dc75e931141de38e7285ef7d..b8616708bd9eb4028b1914b43a3d925af1b7cacc 100644 (file)
--- a/x11-misc/obconf/ChangeLog
+++ b/x11-misc/obconf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/obconf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/ChangeLog,v 1.82 2011/06/18 10:51:19 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/ChangeLog,v 1.83 2011/08/05 15:53:50 hwoarang Exp $
+
+  05 Aug 2011; Markos Chandras <hwoarang@gentoo.org> obconf-9999.ebuild:
+  Sync with 2.0.3_p* ebuilds
 
 *obconf-2.0.3_p20110314-r1 (18 Jun 2011)
 

diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
index 8911fbfba33dfe596430c95732e661ac62c1954f..fdd71800f6aa2710baa3eae5feeea186b1381dd2 100644 (file)
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -10,23 +10,23 @@ EBUILD obconf-2.0.3-r1.ebuild 1089 RMD160 58089fb59e9f43ffdfed03e9561fbdc3199b0d
 EBUILD obconf-2.0.3.ebuild 977 RMD160 6b7a799895e02bf9c6d0f10e173ae55dce04ca81 SHA1 3943919d44115750c41c7a240c15ec33ee24e6f8 SHA256 0177cfd32b50145bc9e237b79ad35f52e3b3f10936fe83de56b5987e3251468d
 EBUILD obconf-2.0.3_p20110314-r1.ebuild 1527 RMD160 65c0b84a25c3050ce3a6c601ec6f2b54331ac8da SHA1 31226cada53574bf80889cb6a5585682842502bf SHA256 e64a073269e5180068293726a110296537e6f3aa1e3b576e4fe51be92fd62cb8
 EBUILD obconf-2.0.3_p20110314.ebuild 1411 RMD160 c6cbe935f79c12f59df372471cd00db06758bddb SHA1 c62998d78f02b863e33fb87984a55cc398b7ccf3 SHA256 d0fc33dce09aad994325ffa4512e49b8bfb72709bd1298e0487e7aec0c27fddc
-EBUILD obconf-9999.ebuild 1085 RMD160 afda86c7f1f2da610831d3ddbc78c99abe63f705 SHA1 8126b2b5394cdd3a3b493af08cad5b81cc3309ae SHA256 38d2a435dd1ae1dc3e7cfc0e1864059e9f4bfc09f17a62d694d99bef3e357ff9
-MISC ChangeLog 9657 RMD160 24a87e1f1c3c373dd22e43ef54832d2c40ae14b1 SHA1 c66e46cbce57ff3d659a5b62495c6e4e1f68f4ac SHA256 763f044906c4eb383bc2286feff3eeebcabec2cfcaba0a80c003af36f5903341
+EBUILD obconf-9999.ebuild 1305 RMD160 60c2f2a0c891712fbc11979021a87f2d961af750 SHA1 a410edc9e16a0274c537a07a3402e48b6e149943 SHA256 4b03327d011d701ad1885b76be297b2231c15762566dd030edb33601f6fd4d5d
+MISC ChangeLog 9760 RMD160 549451a1b251bffb79c1d43f4890f78dbb3aad40 SHA1 9cee561729b0d99e0afc7f105b19683b103ed07a SHA256 da0d8286a31ac902e6a1975c3762de4bbf4d81b0bbb58c3ff57c04bf56ece164
 MISC metadata.xml 335 RMD160 c600d971bc8675522056f2fff821aa27afa95eb1 SHA1 20afa74ae52c0de2dbbb4a78884f84c1823ca868 SHA256 64e1c6ac1bd8e9fdc57724e9286a51bd5e9b3e8aa8f1abb1c08e4f7dc8f4e69a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN/ILdAAoJEPqDWhW0r/LCy5IP/0ke+6Iay/x7dEMkgVKMpiBy
-AngTlRdQSQNnIKumWiT1eKjItnNj3OEvMah3qNpha4x1PeW4lcyfyLVnWzHiVC0J
-fnvfBmDhH7sZi0hFOGps5aBt7B2u3yL1Q4xbotzadYZ0A8tStMcwuF2w+R3nGqYI
-inHZWQZT4kqYSgSf9Nh7/OZQnGP8R9/WHaFZemrgy5Bjs9zfO2JwPROxIwc4YrIU
-jCn/4M7EEhSPFIPfaY4drfnwlSDvyBA7wxkn7QAkMJPFXkMJkVABonXIPDi6Xsza
-dEGCRzTeFBilWkZDN6cxF6UTq/xnmMwWx/LpMQM19qoETR4zJ9eEwTjwdL8rCDLf
-8jt5N0p4imkgYm0K9G57DgEfvB7ZnwciU1mRvLX4/bRU0TuL5CMswudx/zWgQWy/
-kS4etWvzQIEJ+K+M703u59oxY3OIVjaFUaI41tuGZsKGiGqEv9dD6xEMPl0CGQpr
-FMJyfrGT3RrYokZg2LYx/PE7aZGqzKLQtiiV+v+EcHbPP+SRe7C6qsrgH+LRPUaM
-1UuTZz4vDVmohGEBwsCoWEiyjAVCWzf3LkgNWxZZLpkvIyrhsg09CYT7cT3QZlnb
-uSKW65Ta+mguQv+CHPHDPoMCZ9qnOeCqgAhLvV2Sw66/Gf4IktQSu3ya5gyK7ooV
-FOSfqPIEYaSAjML7f7fd
-=rL0p
+iQIcBAEBCgAGBQJOPBH8AAoJEPqDWhW0r/LCZcMP/3DgEByRFT8S+b05L8fvJUEJ
+Bhu4UYE6L9bVtZbBJLwUozZtMUwjGgl6tLyL5yrQBA80mTNPc1Fub3GwOOG310ag
+2jIWlm6HwZd1gHcIewzmatCWNS1IVx+MsWX3SVUDI+q+eB+KgOD5a5vnI2l3vFME
+beOGeJSTqbw2dOO2iJkvu7ihhaCIbgApuTt6MofINyC3FmBAS2HuqhPz7UV7U5B2
+J58YK9Vs2RJWPXy2PV+V21DaZfF8bn4/mbXFJ5wk39uJTe/d6ECnkKn70/EdEd/p
+aFScTdBCSDBdWsX/d3hdvG404kN90CV2uvy93j2VkMD4Ca4eacSANNPby1CW/6WS
+McVTkL1QmTZkXaHHtk76QiEIXWbiNpDQ+P3zlnLb3H8JhL+PfsQrmbbA8c1ETcMg
+jZPzq3Kfa7ctUXySXm/m3ZVDab03OcJOVmuExCJquV+y1UmowaZXWvtkugBDHdut
+AFJyg9K5lt+0ousMSxSknxEAkWDP+LvJscKy2HCQpYhWE3baLHD6TiPkvRXtSA1x
+qDZjymf7AOp+cEfcTPYu4j5m/r263kXh2PsIwle/Bmx+qHB6HRFlnftbbwLXoemY
+qWZPLrmpeCfJ4245zwgmlUsseLWT50aNYkF9Gkgxa/6UBrQG0PTUYPzV+QQ7LykX
+cXejhCVfuzwcEUZZWj5b
+=/eFh
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/obconf/obconf-9999.ebuild b/x11-misc/obconf/obconf-9999.ebuild
index d335cce99c3159091bb0c8c0c7bd84407caab9db..cc0c6fba930884166f03fd765dbe2c96d4f95704 100644 (file)
--- a/x11-misc/obconf/obconf-9999.ebuild
+++ b/x11-misc/obconf/obconf-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/obconf-9999.ebuild,v 1.7 2011/03/29 13:05:12 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/obconf-9999.ebuild,v 1.8 2011/08/05 15:53:50 hwoarang Exp $
 
 EAPI="2"
 
@@ -14,17 +14,21 @@ EGIT_REPO_URI="git://git.openbox.org/dana/obconf.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="nls"
+IUSE="lxde nls"
 
 RDEPEND="gnome-base/libglade:2.0
        x11-libs/gtk+:2
        x11-libs/startup-notification
-       >=x11-wm/openbox-3.4.2"
+       >x11-wm/openbox-3.5.0"
 DEPEND="${RDEPEND}
        nls? ( sys-devel/gettext )
        dev-util/pkgconfig"
 
 src_prepare() {
+       if use lxde; then
+               sed -i -e "/^Exec/s:obconf.*$:obconf-lxde:" ${PN}.desktop || die
+       fi
+       epatch "${FILESDIR}"/${PN}-2.0.3_p20110314-config-path.patch
        eautopoint
        eautoreconf
 }
@@ -35,6 +39,9 @@ src_configure() {
 
 src_install() {
        emake DESTDIR="${D}" install || die "emake install failed"
+       if use lxde; then
+               dobin "${FILESDIR}"/${PN}-lxde || die
+       fi
        dodoc AUTHORS CHANGELOG README || die "dodoc failed"
 }