diff options
Diffstat (limited to 'x11-plugins/cairo-dock-plugins/cairo-dock-plugins-9999-r1.ebuild')
-rw-r--r-- | x11-plugins/cairo-dock-plugins/cairo-dock-plugins-9999-r1.ebuild | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-9999-r1.ebuild b/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-9999-r1.ebuild index 4309297..e1f75cb 100644 --- a/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-9999-r1.ebuild +++ b/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-9999-r1.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: $ @@ -11,7 +11,6 @@ EBZR_REPO_URI="lp:cairo-dock-plug-ins" # Or comment it out to choose the latest ("live") revision. #EBZR_REVISION="2242" - inherit cmake-utils bzr DESCRIPTION="Official plugins for cairo-dock" @@ -22,13 +21,11 @@ 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 @@ -48,14 +45,12 @@ RDEPEND=" vala? ( dev-lang/vala:0.12 ) " - DEPEND="${RDEPEND} dev-util/intltool sys-devel/gettext dev-util/pkgconfig " - pkg_setup() { ewarn "" @@ -68,18 +63,15 @@ pkg_setup() ewarn "" } - src_prepare() { bzr_src_prepare } - # ==== The following lines are from someone else's ebuild, with my notes... # Can't find out what the following line does (no Gentoo documentation on it?) and it seems to find the makefile and compile fine without it, so commenting it out. #MAKE_IN_SOURCE_BUILD=true - # 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. @@ -87,23 +79,28 @@ src_prepare() { # ====== END ===== - src_configure() { - # Next line added because of the same issues/solution as reported on... - # ... http://glx-dock.org/bg_topic.php?t=5733 - export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/local/lib/pkgconfig - - # Next line added because of the same issues/solutions reported on... + # 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 - mycmakeargs="${mycmakeargs} -DROOT_PREFIX=${D} -DCMAKE_INSTALL_PREFIX=/usr" + mycmakeargs="${mycmakeargs} -DROOT_PREFIX=${D} -DCMAKE_INSTALL_PREFIX=/usr" cmake-utils_src_configure } +src_compile() { + # Next line added because of the same issues/solution as reported on... + # ... http://glx-dock.org/bg_topic.php?t=5733 + + # Where to put this variable declaration was inspired from... + # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-0.1.18.ebuild?hideattic=0&view=markup + + PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/local/lib/pkgconfig + emake || die +} pkg_postinst() { ewarn "" |