Remove USE syncml; our system copy is too old wrt #318343 by Simeon Maryasin.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/app-office/osmo/ChangeLog b/app-office/osmo/ChangeLog
index 5f663ece1d679cee5bf1b400fb8a4b310d760550..26163306075eb702b9d901ccc26b5ac9db091dd0 100644 (file)
--- a/app-office/osmo/ChangeLog
+++ b/app-office/osmo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/osmo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/osmo/ChangeLog,v 1.8 2010/04/21 18:22:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/osmo/ChangeLog,v 1.9 2010/05/03 23:23:09 ssuominen Exp $
+
+  03 May 2010; Samuli Suominen <ssuominen@gentoo.org> osmo-0.2.10.ebuild:
+  Remove USE syncml; our system copy is too old wrt #318343 by Simeon
+  Maryasin.
 
   21 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> osmo-0.2.8.ebuild:
   amd64 stable wrt #316335

diff --git a/app-office/osmo/Manifest b/app-office/osmo/Manifest
index d0b7a4554429e45d793540ce28c56b11d408d2e2..12959af07713e69d73ec8c88e5cce98d6ab48b57 100644 (file)
--- a/app-office/osmo/Manifest
+++ b/app-office/osmo/Manifest
@@ -1,6 +1,6 @@
 DIST osmo-0.2.10.tar.gz 851833 RMD160 fa8e7f71c268c5246c48d6cea92cee390607b786 SHA1 aa4b3dda78aa6982e5bc580caa58d8c540495406 SHA256 4e911c52ac64a088f8a812b354084e7adedd1b54cb0435995a2cdc1d194d0845
 DIST osmo-0.2.8.tar.gz 787611 RMD160 9965153e7fb7d058907c96ab35ef1387d88de86e SHA1 49b2f92346618cf1ebbf6d019c6d0baa4a8ee23a SHA256 6d2fe3672a7b6fbe334ed5f2d99bb036057c2584c1ce2b836782adeff6c6f816
-EBUILD osmo-0.2.10.ebuild 980 RMD160 434d1d34db4d9839f03be538e8116bc9afb97e42 SHA1 cb96aff4dbd1f3d66888659dcad7524915bae3b3 SHA256 78b3553b0866b7eec6d19e49e4df93fb3a30d63cce9b5f540ded3e7c619c6ab1
+EBUILD osmo-0.2.10.ebuild 906 RMD160 06eacb7972730d3b789feabb6e9fe8719cd1128a SHA1 b91d159ca6750d0743832e688315f8fc4d423375 SHA256 0fda93cda317408af58d5e251c9aa90ec356a01db3ffa0150ea6e5e141a918d1
 EBUILD osmo-0.2.8.ebuild 887 RMD160 b76b8efed810ab5bdb12dab5cdb5139ea9a6cea4 SHA1 686f8d82da452b8e96ad4e07513459d85d38ea26 SHA256 522bc8507a9da50df267adfbc3e62aae2ffca4439865ed629c7586bdf7a2c639
-MISC ChangeLog 1365 RMD160 21e90d336c00790a928fd9aede2099fc496a1f68 SHA1 6f5594ddda9c1266b808363dbbe3a5ec6070eec0 SHA256 5862bc2b4555ba81f5bea3587517024b8cb54e65a4459c5b397f6fdccb319cc6
-MISC metadata.xml 237 RMD160 6a111d72be7156808fccf10073cffe01bd49f771 SHA1 d0979ec37b108de8b119c4955053aaf410bdcfff SHA256 363353b1045c6bef3b8e205c3af2531dd18fd66b074451d3660aaef299d24573
+MISC ChangeLog 1522 RMD160 68a1349f86f1ac34208bbb3ab09dc15defeb8093 SHA1 9ac8b8a99a5311fcae92492e35e9db404fe4750d SHA256 7785a97e33eaf3d2a2b1f442ef993e886f743479f03d2263be0b12a0fdb83cc3
+MISC metadata.xml 167 RMD160 6f174fdd5033945a3da1b7bbea9796fe17ba2bf8 SHA1 26b8b030985c93a71d6d34f25249320a30b22f36 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241

diff --git a/app-office/osmo/metadata.xml b/app-office/osmo/metadata.xml
index aa102758d377a500d829804492952798d833ef10..540f810e069da644302641f84c42ed73ce7212e6 100644 (file)
--- a/app-office/osmo/metadata.xml
+++ b/app-office/osmo/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>desktop-misc</herd>
-  <use>
-    <flag name="syncml">Enable syncML support</flag>
-  </use>
 </pkgmetadata>

diff --git a/app-office/osmo/osmo-0.2.10.ebuild b/app-office/osmo/osmo-0.2.10.ebuild
index c91a2936879bbf1735169e30df985def1a7a0b27..14fbf721a79e3e28530fe8c8db879fcb7339806c 100644 (file)
--- a/app-office/osmo/osmo-0.2.10.ebuild
+++ b/app-office/osmo/osmo-0.2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/osmo/osmo-0.2.10.ebuild,v 1.1 2010/04/20 10:45:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/osmo/osmo-0.2.10.ebuild,v 1.2 2010/05/03 23:23:09 ssuominen Exp $
 
 EAPI=2
 inherit flag-o-matic
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}-pim/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="syncml"
+IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.12:2
        >=dev-libs/libtar-1.2.11-r3
@@ -21,8 +21,7 @@ RDEPEND=">=x11-libs/gtk+-2.12:2
        >=dev-libs/libical-0.33
        app-text/gtkspell
        =gnome-extra/gtkhtml-2*
-       >=x11-libs/libnotify-0.4.4
-       syncml? ( app-pda/libsyncml )"
+       >=x11-libs/libnotify-0.4.4"
 DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
@@ -31,11 +30,10 @@ src_configure() {
 
        econf \
                --disable-dependency-tracking \
-               $(use_with syncml libsyncml)
+               --without-libsyncml
 }
 
 src_install() {
        emake DESTDIR="${D}" install || die
-       dodoc AUTHORS ChangeLog README TRANSLATORS
-       use syncml && dodoc README.syncml
+       dodoc AUTHORS ChangeLog README TRANSLATORS || die
 }