From f3cf5125faf28cd3fbad427acd6f205a74063c3c Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 5 Sep 2010 13:28:32 +0000 Subject: fix broken ebuild, it didn't install nvidia-settings executable and icons, used make instead of the wrapper function emake and didn't fix the pre-stripping problem of /usr/bin/nvidia-settings. Bumping revision (Portage version: 2.2_rc67/cvs/Linux x86_64) --- media-video/nvidia-settings/ChangeLog | 10 +++- .../nvidia-settings-256.52-r1.ebuild | 68 ++++++++++++++++++++++ .../nvidia-settings/nvidia-settings-256.52.ebuild | 68 ---------------------- 3 files changed, 77 insertions(+), 69 deletions(-) create mode 100644 media-video/nvidia-settings/nvidia-settings-256.52-r1.ebuild delete mode 100644 media-video/nvidia-settings/nvidia-settings-256.52.ebuild (limited to 'media-video/nvidia-settings') diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog index fe2e766edf42..49ae09f2c1c5 100644 --- a/media-video/nvidia-settings/ChangeLog +++ b/media-video/nvidia-settings/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-video/nvidia-settings # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.91 2010/08/30 22:23:24 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.92 2010/09/05 13:28:32 lxnay Exp $ + +*nvidia-settings-256.52-r1 (05 Sep 2010) + + 05 Sep 2010; Fabio Erculiani + -nvidia-settings-256.52.ebuild, +nvidia-settings-256.52-r1.ebuild: + fix broken ebuild, it didn't install nvidia-settings executable and icons, + used make instead of the wrapper function emake and didn't fix the + pre-stripping problem of /usr/bin/nvidia-settings. Bumping revision 30 Aug 2010; Doug Goldstein +nvidia-settings-256.52.ebuild: diff --git a/media-video/nvidia-settings/nvidia-settings-256.52-r1.ebuild b/media-video/nvidia-settings/nvidia-settings-256.52-r1.ebuild new file mode 100644 index 000000000000..87c7d7586c92 --- /dev/null +++ b/media-video/nvidia-settings/nvidia-settings-256.52-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-256.52-r1.ebuild,v 1.1 2010/09/05 13:28:32 lxnay Exp $ + +EAPI=2 + +inherit eutils toolchain-funcs multilib flag-o-matic + +DESCRIPTION="NVIDIA Linux X11 Settings Utility" +HOMEPAGE="http://www.nvidia.com/" +SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" +IUSE="" + +# xorg-server is used in the depends as nvidia-settings builds against some +# headers in /usr/include/xorg/. +# This also allows us to optimize out a lot of the other dependancies, as +# between gtk and xorg-server, almost all libraries and headers are accounted +# for. +DEPEND=">=x11-libs/gtk+-2 + dev-util/pkgconfig + x11-base/xorg-server + x11-libs/libXt + x11-libs/libXv + x11-proto/xf86driproto + x11-proto/xf86vidmodeproto" + +RDEPEND=">=x11-libs/gtk+-2 + x11-base/xorg-server + x11-libs/libXt + x11-drivers/nvidia-drivers" + +src_prepare() { + sed -i -e "s#prefix = .*#prefix = ${D}/usr#" utils.mk +} + +src_compile() { + einfo "Building libXNVCtrl..." + cd "${S}/src/libXNVCtrl" + emake clean || die "Cleaning old libXNVCtrl failed" + append-flags -fPIC + emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" libXNVCtrl.a || die "Building libXNVCtrl failed!" + filter-flags -fPIC + + cd "${S}" + einfo "Building nVidia-Settings..." + emake CC="$(tc-getCC)" STRIP_CMD=/bin/true || die "Failed to build nvidia-settings" +} + +src_install() { + emake STRIP_CMD=/bin/true install || die + + # Install libXNVCtrl and headers + insinto "/usr/$(get_libdir)" + doins src/libXNVCtrl/libXNVCtrl.a + insinto /usr/include/NVCtrl + doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h + + # Install icon and .desktop entry + doicon "${FILESDIR}/icon/${PN}.png" + domenu "${FILESDIR}/icon/${PN}.desktop" + + # Now install documentation + dodoc doc/*.txt +} diff --git a/media-video/nvidia-settings/nvidia-settings-256.52.ebuild b/media-video/nvidia-settings/nvidia-settings-256.52.ebuild deleted file mode 100644 index f1c0dc9d19b1..000000000000 --- a/media-video/nvidia-settings/nvidia-settings-256.52.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-256.52.ebuild,v 1.3 2010/08/30 22:23:24 cardoe Exp $ - -EAPI=2 - -inherit eutils toolchain-funcs multilib flag-o-matic - -DESCRIPTION="NVIDIA Linux X11 Settings Utility" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" -IUSE="" - -# xorg-server is used in the depends as nvidia-settings builds against some -# headers in /usr/include/xorg/. -# This also allows us to optimize out a lot of the other dependancies, as -# between gtk and xorg-server, almost all libraries and headers are accounted -# for. -DEPEND=">=x11-libs/gtk+-2 - dev-util/pkgconfig - x11-base/xorg-server - x11-libs/libXt - x11-libs/libXv - x11-proto/xf86driproto - x11-proto/xf86vidmodeproto" - -RDEPEND=">=x11-libs/gtk+-2 - x11-base/xorg-server - x11-libs/libXt - x11-drivers/nvidia-drivers" - -src_prepare() { - sed -i -e "s#prefix = .*#prefix = ${D}/usr#" utils.mk -} - -src_compile() { - einfo "Building libXNVCtrl..." - cd "${S}/src/libXNVCtrl" - make clean || die "Cleaning old libXNVCtrl failed" - append-flags -fPIC - emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" libXNVCtrl.a || die "Building libXNVCtrl failed!" - filter-flags -fPIC - - #cd "${S}" - #einfo "Building nVidia-Settings..." - #emake CC="$(tc-getCC)" || die "Failed to build nvidia-settings" -} - -src_install() { - #make STRIP_CMD=/bin/true install - - # Install libXNVCtrl and headers - insinto "/usr/$(get_libdir)" - doins src/libXNVCtrl/libXNVCtrl.a - insinto /usr/include/NVCtrl - doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h - - # Install icon and .desktop entry - #doicon "${FILESDIR}/icon/${PN}.png" - #domenu "${FILESDIR}/icon/${PN}.desktop" - - # Now install documentation - dodoc doc/*.txt -} -- cgit v1.2.3-65-gdbad