New dependencies and comments for cairo-dock*

4 files changed, 66 insertions, 14 deletions

diff --git a/x11-misc/cairo-dock/Manifest b/x11-misc/cairo-dock/Manifest
index 7018028..9b358e0 100644
--- a/x11-misc/cairo-dock/Manifest
+++ b/x11-misc/cairo-dock/Manifest
@@ -1,3 +1,3 @@
-EBUILD cairo-dock-9999.ebuild 1027 RMD160 c4c0720891db2ff7e75f877c2d2b78111957f5a9 SHA1 fce6c04d78edb33fc1209c1b0f2c0e8b176a2e7e SHA256 3ab89addc4d1400952c29cddb2038727e39e566cbde37e43c21de2f14a25cdd3
+EBUILD cairo-dock-9999.ebuild 1673 RMD160 a11c05e1ac8126b7593c2b5136813c253f536561 SHA1 de4ac47de522370629c38ddffb34e0dbdc54071c SHA256 cab9f61e694a69ac570fb42087d92e2251687caeae06a6acd213d8bf1ac00181
 MISC ChangeLog 240 RMD160 55af20059609afd5f2f7c6587a398a8771ad3b97 SHA1 954131dc27940452045dd947d865332f92420cbe SHA256 ffd103359939888e5c0463fda3245d4e54b55fdcc16782e5e83f14fbaaa31efd
 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 9747679..133f4a1 100644
--- a/x11-misc/cairo-dock/cairo-dock-9999.ebuild
+++ b/x11-misc/cairo-dock/cairo-dock-9999.ebuild
@@ -6,8 +6,12 @@ EAPI="2"
 
 inherit cmake-utils bzr
 
+# Launchpad repository where "cairo-dock" lives:
 EBZR_REPO_URI="lp:cairo-dock-core"
-#EBZR_REPO_URI="lp:cairo-dock-core/2.3"
+
+
+# You can specify a certain revision from the repository here.
+# Or comment it out to choose the latest ("live") revision.
 #EBZR_REVISION="959"
 
 
@@ -20,6 +24,10 @@ SLOT="0"
 KEYWORDS=""
 IUSE="xcomposite"
 
+
+# Dependencies are listed here:
+# http://glx-dock.org/ww_page.php?p=From%20BZR&lang=en
+
 RDEPEND="
 	dev-libs/dbus-glib
 	dev-libs/glib:2
@@ -30,6 +38,8 @@ RDEPEND="
 	x11-libs/gtk+:2
 	x11-libs/gtkglext
 	x11-libs/libXrender
+	net-misc/curl
+	x11-libs/pango
 	xcomposite? (
 		x11-libs/libXcomposite
 		x11-libs/libXinerama
@@ -44,6 +54,21 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 "
 
+
+pkg_setup()
+{
+	ewarn ""
+	ewarn ""
+	ewarn "THIS IS A LIVE EBUILD, NOT AN OFFICIAL RELEASE."
+	ewarn "   Thus, it may FAIL to build properly."
+	ewarn "   Please do NOT report bugs to Gentoo's bugzilla."
+	ewarn "   Instead, report all bugs to write2david@gmail.com"
+	ewarn ""
+	ewarn ""
+}
+
+
+
 src_prepare() {
 	bzr_src_prepare
 }
@@ -51,8 +76,14 @@ src_prepare() {
 
 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 write2David@gmail.com"
-}
+	ewarn ""
+	ewarn ""
+	ewarn "THIS IS A LIVE EBUILD, NOT AN OFFICIAL RELEASE."
+	ewarn "   Thus, it may FAIL to run properly."
+	ewarn "   Please do NOT report bugs to Gentoo's bugzilla."
+	ewarn "   Instead, report all bugs to write2david@gmail.com"
+	ewarn ""
+	ewarn ""
+}
\ No newline at end of file
diff --git a/x11-plugins/cairo-dock-plugins/Manifest b/x11-plugins/cairo-dock-plugins/Manifest
index af4b048..637c14b 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
+EBUILD cairo-dock-plugins-9999.ebuild 2916 RMD160 261557b98a558304fb6a04c62fe124b6f2c9ccca SHA1 652f06bd27049676f0b56508c2907105b13c2f3b SHA256 fa91a8cb095df1a25a4362065ad1aea0367656da1e439c1f0e45da35bdf0b3d4
 MISC ChangeLog 240 RMD160 55af20059609afd5f2f7c6587a398a8771ad3b97 SHA1 954131dc27940452045dd947d865332f92420cbe SHA256 ffd103359939888e5c0463fda3245d4e54b55fdcc16782e5e83f14fbaaa31efd
 MISC metadata.xml 276 RMD160 0c0c308f1457fd6b3524628543f0452d1dc39197 SHA1 e296372ecbbb13ad02430b5d323ea54c7fc5f086 SHA256 cc9796aef23ea695fd2cc82f8c763e3463f4ddcc335f716740ef0d568f4ca6e9
diff --git a/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-9999.ebuild b/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-9999.ebuild
index d0f29cd..003ddb0 100644
--- a/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-9999.ebuild
+++ b/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-9999.ebuild
@@ -3,7 +3,12 @@
 # $Header: $
 
 EAPI="2"
+
+# Launchpad repository where "cairo-dock-plugins" lives:
 EBZR_REPO_URI="lp:cairo-dock-plug-ins"
+
+# You can specify a certain revision from the repository here.
+# Or comment it out to choose the latest ("live") revision.
 #EBZR_REVISION="2242"
 
 
@@ -16,10 +21,22 @@ SRC_URI=""
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
+
+
+# The next line has been stripped down somewhat from a longer version
+# used in the ebuilds of other overlays.  For more info, see:
+# https://bugs.launchpad.net/cairo-dock-plug-ins/+bug/922981/comments/8
 IUSE="alsa exif gmenu terminal vala webkit xfce xgamma xklavier"
 
+
+# Dependencies are listed here:
+# http://glx-dock.org/ww_page.php?p=From%20BZR&lang=en
+
 RDEPEND="
 	~x11-misc/cairo-dock-${PV}
+	x11-libs/cairo
+	gnome-base/librsvg
+	dev-libs/libxml2
 	alsa? ( media-libs/alsa-lib )
 	exif? ( media-libs/libexif )
 	gmenu? ( gnome-base/gnome-menus )
@@ -31,6 +48,7 @@ RDEPEND="
 	vala? ( dev-lang/vala:0.12 )
 "
 
+
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
@@ -42,9 +60,10 @@ pkg_setup()
 {
 	ewarn ""
 	ewarn ""
-	ewarn "THIS IS A LIVE EBUILD, SO IT MAY NOT BUILD RIGHT!"
-	ewarn "DO NOT report bugs to Gentoo's bugzilla"
-	ewarn "Please report all bugs to write2david@gmail.com"
+	ewarn "THIS IS A LIVE EBUILD, NOT AN OFFICIAL RELEASE."
+	ewarn "   Thus, it may FAIL to build properly."
+	ewarn "   Please do NOT report bugs to Gentoo's bugzilla."
+	ewarn "   Instead, report all bugs to write2david@gmail.com"
 	ewarn ""
 	ewarn ""
 }
@@ -61,6 +80,7 @@ src_prepare() {
 
 # Actually, it looks like it is supposed to be CMAKE_IN_SOURCE_BUILD
 # http://devmanual.gentoo.org/eclass-reference/cmake-utils.eclass/index.html
+# But still not needed, so it is still commented out.
 #CMAKE_IN_SOURCE_BUILD=true
 
 
@@ -82,9 +102,10 @@ src_configure() {
 pkg_postinst() {
 	ewarn ""
 	ewarn ""
-	ewarn "THIS IS A LIVE EBUILD, SO IT MAY NOT RUN RIGHT!"
-	ewarn "DO NOT report bugs to Gentoo's bugzilla"
-	ewarn "Please report all bugs to write2david@gmail.com"
+	ewarn "THIS IS A LIVE EBUILD, NOT AN OFFICIAL RELEASE."
+	ewarn "   Thus, it may FAIL to run properly."
+	ewarn "   Please do NOT report bugs to Gentoo's bugzilla."
+	ewarn "   Instead, report all bugs to write2david@gmail.com"
 	ewarn ""
 	ewarn ""
-}
+}
\ No newline at end of file