Mostly fix metadata.xml in cairo-dock*

12 files changed, 78 insertions, 17 deletions

diff --git a/app-editors/komodo-edit-bin/Manifest b/app-editors/komodo-edit-bin/Manifest
new file mode 100644
index 0000000..d8c156c
--- /dev/null
+++ b/app-editors/komodo-edit-bin/Manifest
@@ -0,0 +1,3 @@
+DIST Komodo-Edit-6.1.3-8844-linux-libcpp6-x86.tar.gz 42410776 RMD160 2a1c55818ac80c4f218555b1e855153bb094e866 SHA1 f228fad36452249b0cbe3037520239a962ff3992 SHA256 5107fae94605ded6a5a18b84ab2d06dc4cc7339bcacb7bcd32a364ffdf02a729
+DIST Komodo-Edit-6.1.3-8844-linux-libcpp6-x86_64.tar.gz 44169317 RMD160 c028cf3e7e53f20dfd724e6b93e3ed1129e15515 SHA1 314848452523aced6371ff3bd6aa568f49e04371 SHA256 ca5fb115456db656e7587c7ce066ec75f27bf9a837d548067bb0d3f91fa59f94
+EBUILD komodo-edit-bin-6.1.3.ebuild 2360 RMD160 81361f2cf0327437ca1766565581c09513df18d4 SHA1 dac64f86bd05a554f2df626e774f1e0f8c421565 SHA256 7636ddee4f530e48cde907a305c22754f2be52fe1fca23b08eff3f64855a2bd6
diff --git a/app-editors/komodo-edit-bin/komodo-edit-bin-6.1.3.ebuild b/app-editors/komodo-edit-bin/komodo-edit-bin-6.1.3.ebuild
new file mode 100644
index 0000000..4720b12
--- /dev/null
+++ b/app-editors/komodo-edit-bin/komodo-edit-bin-6.1.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit eutils versionator
+
+MY_MINOR_VERSION="$(get_version_component_range 1-6)"
+MY_BUILD="8844"
+
+DESCRIPTION="Freeware advanced editor for dynamic and Web languages"
+HOMEPAGE="http://www.activestate.com/products/komodo_edit"
+LICENSE="ActiveState Komodo Edit"
+
+SRC_URI="x86?   ( http://downloads.activestate.com/Komodo/releases/${MY_MINOR_VERSION}/Komodo-Edit-${PV}-${MY_BUILD}-linux-libcpp6-x86.tar.gz    )
+         amd64? ( http://downloads.activestate.com/Komodo/releases/${MY_MINOR_VERSION}/Komodo-Edit-${PV}-${MY_BUILD}-linux-libcpp6-x86_64.tar.gz )"
+
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE="default-templates"
+
+DEPEND="virtual/jpeg
+        virtual/libc"
+
+RDEPEND="${DEPEND}"
+
+RESTRICT="mirror"
+
+use amd64 && MY_ARCH='x86_64' || MY_ARCH=${ARCH}
+S="${WORKDIR}/Komodo-Edit-${PV}-${MY_BUILD}-linux-libcpp6-${MY_ARCH}"
+
+src_install() {
+
+        KOMODO_EDIT_INSTALLDIR="/opt/${P}"
+
+        dodir "${KOMODO_EDIT_INSTALLDIR}"
+
+        "${S}/install.sh" \
+                --install-dir "${D}/${KOMODO_EDIT_INSTALLDIR}" \
+                --dest-dir ${KOMODO_EDIT_INSTALLDIR} \
+                --suppress-shortcut || die "original installer script failed"
+
+        dosym "${KOMODO_EDIT_INSTALLDIR}/bin/komodo" "/usr/bin/${P}" &&
+        dosym "./${P}" "/usr/bin/${PN}" ||
+                die "failed dosym Komodo launcher script"
+
+        # Most default templates are empty, or near-empty, and can clutter
+        # the new file dialog, so we permit not to install them.
+        use default-templates || (
+                rm -R "${D}/${KOMODO_EDIT_INSTALLDIR}/"lib/mozilla/extensions/*/templates/* &&
+                rm -R "${D}/${KOMODO_EDIT_INSTALLDIR}/"lib/support/default-templates/* ||
+                        die "failed removing default templates"
+        )
+
+       dodoc install.html license.txt relnotes.html || die "dodoc failed"
+
+        dosym "${KOMODO_EDIT_INSTALLDIR}/share/icons/komodo48.png" \
+                "/usr/share/pixmaps/${PN}.png" || die "dosym pixmap icon failed"
+
+        make_desktop_entry \
+                "${PN}" \
+                "Komodo Edit" \
+                "${PN}.png" \
+                "Development;IDE;Editor;TextEditor;ActiveState" ||
+                        die "make_desktop_entry failed"
+}
diff --git a/app-portage/bemerge/bemerge-0.4.1-r1.ebuild b/app-portage/bemerge/bemerge-0.4.1-r1.ebuild
index c669b70..c669b70 100644..100755
--- a/app-portage/bemerge/bemerge-0.4.1-r1.ebuild
+++ b/app-portage/bemerge/bemerge-0.4.1-r1.ebuild
diff --git a/app-portage/bemerge/bemerge-0.4.1.ebuild b/app-portage/bemerge/bemerge-0.4.1.ebuild
index 824f651..824f651 100644..100755
--- a/app-portage/bemerge/bemerge-0.4.1.ebuild
+++ b/app-portage/bemerge/bemerge-0.4.1.ebuild
diff --git a/app-portage/bemerge/bemerge-0.45.ebuild b/app-portage/bemerge/bemerge-0.45.ebuild
index 1156f20..1156f20 100644..100755
--- a/app-portage/bemerge/bemerge-0.45.ebuild
+++ b/app-portage/bemerge/bemerge-0.45.ebuild
diff --git a/app-portage/bemerge/bemerge-0.46.ebuild b/app-portage/bemerge/bemerge-0.46.ebuild
index e296af5..e296af5 100644..100755
--- a/app-portage/bemerge/bemerge-0.46.ebuild
+++ b/app-portage/bemerge/bemerge-0.46.ebuild
diff --git a/app-portage/bemerge/bemerge-0.47.ebuild b/app-portage/bemerge/bemerge-0.47.ebuild
index 1888de9..1888de9 100644..100755
--- a/app-portage/bemerge/bemerge-0.47.ebuild
+++ b/app-portage/bemerge/bemerge-0.47.ebuild
diff --git a/x11-misc/cairo-dock/Manifest b/x11-misc/cairo-dock/Manifest
index 3b1c06a..7018028 100644
--- a/x11-misc/cairo-dock/Manifest
+++ b/x11-misc/cairo-dock/Manifest
@@ -1,3 +1,3 @@
-EBUILD cairo-dock-9999.ebuild 1319 RMD160 0b52171d11bdd67bacec52bff3f06e3c3c838385 SHA1 4eb6baf2a1391d3ee0cddc4e7d6202e76ad9dc22 SHA256 2d701a80b3f1c8ea386136a927fcad205e8723336db74ce0a34d700133b31ebc
+EBUILD cairo-dock-9999.ebuild 1027 RMD160 c4c0720891db2ff7e75f877c2d2b78111957f5a9 SHA1 fce6c04d78edb33fc1209c1b0f2c0e8b176a2e7e SHA256 3ab89addc4d1400952c29cddb2038727e39e566cbde37e43c21de2f14a25cdd3
 MISC ChangeLog 240 RMD160 55af20059609afd5f2f7c6587a398a8771ad3b97 SHA1 954131dc27940452045dd947d865332f92420cbe SHA256 ffd103359939888e5c0463fda3245d4e54b55fdcc16782e5e83f14fbaaa31efd
-MISC metadata.xml 283 RMD160 e0f08c017c57b0424ffa9250b0e8818d3b3253cd SHA1 62374de770ec97144aa653d355d581b93fa68755 SHA256 1c3d6ef6576788b50b9140d7578885034d5ddb210138d78de6a0a77c35b3d2b4
+MISC metadata.xml 276 RMD160 0c0c308f1457fd6b3524628543f0452d1dc39197 SHA1 e296372ecbbb13ad02430b5d323ea54c7fc5f086 SHA256 cc9796aef23ea695fd2cc82f8c763e3463f4ddcc335f716740ef0d568f4ca6e9
diff --git a/x11-misc/cairo-dock/cairo-dock-9999.ebuild b/x11-misc/cairo-dock/cairo-dock-9999.ebuild
index 05d7373..9747679 100644
--- a/x11-misc/cairo-dock/cairo-dock-9999.ebuild
+++ b/x11-misc/cairo-dock/cairo-dock-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -36,6 +36,8 @@ RDEPEND="
 		x11-libs/libXtst
 	)
 "
+
+
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	dev-util/pkgconfig
@@ -44,23 +46,13 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	bzr_src_prepare
-#	intltoolize --automake --copy --force || die "intltoolize failed"
-#	eautoreconf
 }
 
-#src_configure() {
-#	econf $(use_enable xcomposite xextend)
-#}
-
-#src_install() {
-#	#emake DESTDIR="${D}" install || die "emake install failed"
-#}
 
 MAKE_IN_SOURCE_BUILD=true
 
 pkg_postinst() {
 	ewarn "THIS IS A LIVE EBUILD, SO YOU KNOW THE RISKS !"
 	ewarn "DO NOT report bugs to Gentoo's bugzilla"
-	ewarn "Please report all bugs to #gentoo-desktop-effects"
-	einfo "Thank you on behalf of the Gentoo Desktop-Effects team"
+	ewarn "Please report all bugs to write2David@gmail.com"
 }
diff --git a/x11-misc/cairo-dock/metadata.xml b/x11-misc/cairo-dock/metadata.xml
index 074b761..cd0692a 100644
--- a/x11-misc/cairo-dock/metadata.xml
+++ b/x11-misc/cairo-dock/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-</use>
 <herd>no-herd</herd>
 <longdescription>Cairo-dock is a kind of dock applet, which doesn't depend on any gnome package.</longdescription>
 </pkgmetadata>
diff --git a/x11-plugins/cairo-dock-plugins/Manifest b/x11-plugins/cairo-dock-plugins/Manifest
index cd012e9..af4b048 100644
--- a/x11-plugins/cairo-dock-plugins/Manifest
+++ b/x11-plugins/cairo-dock-plugins/Manifest
@@ -1,3 +1,3 @@
 EBUILD cairo-dock-plugins-9999.ebuild 2205 RMD160 c73c835c992231c1347984cd877ba434b3b5bdac SHA1 8ff86e3321c954da83f8773edd34cfeff8bdd34b SHA256 ab91b541071137578c49c9d497d425de22e876363f04fb4075ed281451397b8b
 MISC ChangeLog 240 RMD160 55af20059609afd5f2f7c6587a398a8771ad3b97 SHA1 954131dc27940452045dd947d865332f92420cbe SHA256 ffd103359939888e5c0463fda3245d4e54b55fdcc16782e5e83f14fbaaa31efd
-MISC metadata.xml 283 RMD160 e0f08c017c57b0424ffa9250b0e8818d3b3253cd SHA1 62374de770ec97144aa653d355d581b93fa68755 SHA256 1c3d6ef6576788b50b9140d7578885034d5ddb210138d78de6a0a77c35b3d2b4
+MISC metadata.xml 276 RMD160 0c0c308f1457fd6b3524628543f0452d1dc39197 SHA1 e296372ecbbb13ad02430b5d323ea54c7fc5f086 SHA256 cc9796aef23ea695fd2cc82f8c763e3463f4ddcc335f716740ef0d568f4ca6e9
diff --git a/x11-plugins/cairo-dock-plugins/metadata.xml b/x11-plugins/cairo-dock-plugins/metadata.xml
index 074b761..cd0692a 100644
--- a/x11-plugins/cairo-dock-plugins/metadata.xml
+++ b/x11-plugins/cairo-dock-plugins/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-</use>
 <herd>no-herd</herd>
 <longdescription>Cairo-dock is a kind of dock applet, which doesn't depend on any gnome package.</longdescription>
 </pkgmetadata>