summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Phillips <write2david@gmail.com>2012-05-20 15:32:31 -0500
committerDavid Phillips <write2david@gmail.com>2012-05-20 15:32:31 -0500
commit40dc13fac544041295c625ed2b8f099aef236b67 (patch)
tree7d7fd3e798ab92b54733a363cf89aa69d72f7288 /x11-misc
parentAgain (diff)
downloadwrite2David-40dc13fac544041295c625ed2b8f099aef236b67.tar.gz
write2David-40dc13fac544041295c625ed2b8f099aef236b67.tar.bz2
write2David-40dc13fac544041295c625ed2b8f099aef236b67.zip
Back to working again
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/cairo-dock/Manifest2
-rw-r--r--x11-misc/cairo-dock/cairo-dock-9999.ebuild25
2 files changed, 23 insertions, 4 deletions
diff --git a/x11-misc/cairo-dock/Manifest b/x11-misc/cairo-dock/Manifest
index 9b358e0..0a3ed1a 100644
--- a/x11-misc/cairo-dock/Manifest
+++ b/x11-misc/cairo-dock/Manifest
@@ -1,3 +1,3 @@
-EBUILD cairo-dock-9999.ebuild 1673 RMD160 a11c05e1ac8126b7593c2b5136813c253f536561 SHA1 de4ac47de522370629c38ddffb34e0dbdc54071c SHA256 cab9f61e694a69ac570fb42087d92e2251687caeae06a6acd213d8bf1ac00181
+EBUILD cairo-dock-9999.ebuild 2534 RMD160 85de5958919d5bed3d53915d3830706a72fe5da9 SHA1 7259c40dfae9543872a200bb98fa40ea2ae6205c SHA256 b8aeacdc49b5a4ef6e09835c13f502e11292b975741768941ec02e41934acf7b
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 133f4a1..aa7de05 100644
--- a/x11-misc/cairo-dock/cairo-dock-9999.ebuild
+++ b/x11-misc/cairo-dock/cairo-dock-9999.ebuild
@@ -25,7 +25,7 @@ KEYWORDS=""
IUSE="xcomposite"
-# Dependencies are listed here:
+# Installation instructions (from BZR source) and dependencies are listed here:
# http://glx-dock.org/ww_page.php?p=From%20BZR&lang=en
RDEPEND="
@@ -74,7 +74,26 @@ src_prepare() {
}
-MAKE_IN_SOURCE_BUILD=true
+# Not sure what the next line does. Can't find any documenation about it.
+# Maybe it does nothing? Help?!
+#MAKE_IN_SOURCE_BUILD=true
+
+src_configure() {
+
+ # Next line added because of the same issues/solutions reported on...
+ # ... # https://bugs.launchpad.net/cairo-dock-plug-ins/+bug/922981
+ #
+ # With a solution inspired on...
+ # http://code.google.com/p/rion-overlay/source/browse/x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.3.9999.ebuild?spec=svn71d4acbbb8c297b818ff886fb5dd434a6f54c377&r=71d4acbbb8c297b818ff886fb5dd434a6f54c377
+
+ # These CMAKE variables are listed on the BZR installation instructions
+ # (link above)
+
+ # Some more info...
+ # http://www.cmake.org/Wiki/CMake_Useful_Variables
+ mycmakeargs="${mycmakeargs} -DROOT_PREFIX=${D} -DCMAKE_INSTALL_PREFIX=/usr"
+ cmake-utils_src_configure
+}
pkg_postinst() {
@@ -86,4 +105,4 @@ pkg_postinst() {
ewarn " Instead, report all bugs to write2david@gmail.com"
ewarn ""
ewarn ""
-} \ No newline at end of file
+}