New release.

(Portage version: 2.0.53)

8 files changed, 200 insertions, 31 deletions

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index d388479ebf13..e76a6023c0d4 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/nvidia-settings
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.14 2005/08/24 12:52:58 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.15 2005/12/05 21:37:31 azarah Exp $
+
+*nvidia-settings-1.0.20051122 (05 Dec 2005)
+
+  05 Dec 2005; Martin Schlemmer <azarah@gentoo.org>
+  +nvidia-settings-1.0.20051122.ebuild:
+  New release.
 
 *nvidia-settings-1.0.20050729 (24 Aug 2005)
 
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
index c8fec56b7357..6aefef5e6a82 100644
--- a/media-video/nvidia-settings/Manifest
+++ b/media-video/nvidia-settings/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6a85441f269b195cfa3f1a8a6422120c nvidia-settings-1.0.20050525.ebuild 1539
-MD5 9df89547cf34bfb5ffa1177e2ce00c00 nvidia-settings-1.0.6111.ebuild 1128
 MD5 bddb42d228072e703415f15a25ffca0a ChangeLog 2686
-MD5 230d885c5f928254a3791e8f7b2bcc17 nvidia-settings-1.0.6629.ebuild 1128
-MD5 d7f90e0d8347493b76fad3613ccd4c91 nvidia-settings-1.0.7167.ebuild 1322
-MD5 7bbeebd18631e196cdf02e30c2008310 nvidia-settings-1.0.20050729.ebuild 1607
-MD5 b48738468061c96675a782947951d3d8 metadata.xml 300
+MD5 ba114bf17302ecdb08e065953295cc03 files/digest-nvidia-settings-1.0.20050525 81
+MD5 47ecc5e991834fd43188034d76fbbc96 files/digest-nvidia-settings-1.0.20050729 81
+MD5 5f2cbe0077553362cfec46c11a1839fa files/digest-nvidia-settings-1.0.20051122 81
+MD5 d15804c20077d1318d338ec3db0ac495 files/digest-nvidia-settings-1.0.6111 76
 MD5 0a39b5babdda1f3d78fee4db5b053b0a files/digest-nvidia-settings-1.0.6629 76
 MD5 ce276d6edd87a8f9f2bfc81f2d4fcfed files/digest-nvidia-settings-1.0.7167 76
-MD5 47ecc5e991834fd43188034d76fbbc96 files/digest-nvidia-settings-1.0.20050729 81
 MD5 92faa535f9924a7ef5a2578d13d43fb3 files/libXNVCtrl.a.bz2 2797
-MD5 ba114bf17302ecdb08e065953295cc03 files/digest-nvidia-settings-1.0.20050525 81
-MD5 d15804c20077d1318d338ec3db0ac495 files/digest-nvidia-settings-1.0.6111 76
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD4DBQFDDG4O1ZcsMnZjRyIRAmmGAJjyHPIqfRdBvamUhoes3s2lFgi3AKCBPrxc
-GigX8EQx7no8E8x1v3ejBw==
-=bWkk
------END PGP SIGNATURE-----
+MD5 b48738468061c96675a782947951d3d8 metadata.xml 300
+MD5 6a85441f269b195cfa3f1a8a6422120c nvidia-settings-1.0.20050525.ebuild 1539
+MD5 7bbeebd18631e196cdf02e30c2008310 nvidia-settings-1.0.20050729.ebuild 1607
+MD5 7bbeebd18631e196cdf02e30c2008310 nvidia-settings-1.0.20051122.ebuild 1607
+MD5 9df89547cf34bfb5ffa1177e2ce00c00 nvidia-settings-1.0.6111.ebuild 1128
+MD5 230d885c5f928254a3791e8f7b2bcc17 nvidia-settings-1.0.6629.ebuild 1128
+MD5 d7f90e0d8347493b76fad3613ccd4c91 nvidia-settings-1.0.7167.ebuild 1322
diff --git a/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20051122 b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20051122
new file mode 100644
index 000000000000..c850c0cf2f64
--- /dev/null
+++ b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20051122
@@ -0,0 +1 @@
+MD5 36f53ad25a171cf4be4c9912445cfcdb nvidia-settings-1.0.20051122.tar.gz 1091361
diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.20051122.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.20051122.ebuild
new file mode 100644
index 000000000000..47cdd80082d7
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-1.0.20051122.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.20051122.ebuild,v 1.1 2005/12/05 21:37:31 azarah Exp $
+
+inherit eutils toolchain-funcs multilib
+
+NVIDIA_VERSION="1.0.7664"
+S="${WORKDIR}/${PN}-1.0"
+DESCRIPTION="NVIDIA Linux X11 Settings Utility"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	http://dev.gentoo.org/~azarah/nvidia/${P}.tar.gz"
+# Real SRC_URI:  ftp://download.nvidia.com/XFree86/nvidia-settings/
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~x86 ~amd64"
+IUSE=
+
+DEPEND="virtual/libc
+	virtual/x11
+	>=x11-libs/gtk+-2"
+RDEPEND=">=media-video/nvidia-glx-${NVIDIA_VERSION}
+	>=media-video/nvidia-kernel-${NVIDIA_VERSION}"
+
+src_compile() {
+	cd ${S}/src/libXNVCtrl
+	einfo "Building libXNVCtrl..."
+	# This next voodoo is just to work around xmkmf's broken behaviour
+	# after the Xorg move to /usr (or I think, as I have not messed
+	# with it in ages).
+	ln -snf ${ROOT}/usr/include/X11 include
+	xmkmf -a || die "Running xmkmf failed!"
+	make CCOPTIONS="${CFLAGS}" clean all || die "Building libXNVCtrl failed!"
+
+	cd ${S}
+	einfo "Building nVidia-Settings..."
+	emake CC=$(tc-getCC) || die "Failed to build nvidia-settings"
+}
+
+src_install() {
+	# Install the executable
+	exeinto /usr/bin
+	doexe nvidia-settings
+
+	# Install libXNVCtrl and headers
+	insinto "/usr/$(get_libdir)"
+	doins src/libXNVCtrl/libXNVCtrl.a
+	insinto /usr/include/NVCtrl
+	doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h
+
+	# Now install documentation
+	rm -f doc/Makefile*
+	dodoc doc/*
+}
diff --git a/sys-apps/sandbox/ChangeLog b/sys-apps/sandbox/ChangeLog
index f3850bbbc1d6..5716a1570dda 100644
--- a/sys-apps/sandbox/ChangeLog
+++ b/sys-apps/sandbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/sandbox
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.52 2005/12/02 12:48:51 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.53 2005/12/05 21:33:13 azarah Exp $
+
+*sandbox-1.2.17 (05 Dec 2005)
+
+  05 Dec 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.17.ebuild:
+  New release.
 
 *sandbox-1.2.16 (02 Dec 2005)
 
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 0bbd81edd75b..61b7ea2b8f89 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0703fccf974600fa3180849ea64813f9 ChangeLog 6971
 MD5 97d135bb57b8e72a00cb615055d919cc files/digest-sandbox-1.2.12 67
 MD5 ed12f6dab5b8d733c60a6495cbaa43a9 files/digest-sandbox-1.2.16 67
+MD5 e0f8166a9400117ec34a2f258edd09d4 files/digest-sandbox-1.2.17 67
 MD5 4a6b419321a7e1ee609c8af41905ff1b metadata.xml 337
 MD5 3bd9114811a6ab32056c15562df7c540 sandbox-1.2.12.ebuild 3160
 MD5 f4609f8335c1cf5310bf8f8580497233 sandbox-1.2.16.ebuild 3050
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDkfgngIKl8Uu19MoRAr73AJ9Xcb0ItMjUoJJlt4VH13sNq8PAuQCdErgl
-HTZ1dWOPvFQzgkfy/klLZ7o=
-=EyOH
------END PGP SIGNATURE-----
+MD5 f4609f8335c1cf5310bf8f8580497233 sandbox-1.2.17.ebuild 3050
diff --git a/sys-apps/sandbox/files/digest-sandbox-1.2.17 b/sys-apps/sandbox/files/digest-sandbox-1.2.17
new file mode 100644
index 000000000000..41c4d2abd4b0
--- /dev/null
+++ b/sys-apps/sandbox/files/digest-sandbox-1.2.17
@@ -0,0 +1 @@
+MD5 dc989b98ba8e096eea611b0ac3be16cb sandbox-1.2.17.tar.bz2 233461
diff --git a/sys-apps/sandbox/sandbox-1.2.17.ebuild b/sys-apps/sandbox/sandbox-1.2.17.ebuild
new file mode 100644
index 000000000000..ffdcea4b89f1
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-1.2.17.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.17.ebuild,v 1.1 2005/12/05 21:33:13 azarah Exp $
+
+#
+# don't monkey with this ebuild unless contacting portage devs.
+# period.
+#
+
+inherit eutils flag-o-matic eutils toolchain-funcs multilib
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~azarah/sandbox/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+#KEYWORDS=" alpha  amd64  arm  hppa  ia64  m68k  mips  ppc  ppc64  s390  sh  sparc  x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+RESTRICT="multilib-pkg-force"
+
+DEPEND=""
+
+setup_multilib() {
+	if use amd64 && has_m32 && [[ ${CONF_MULTILIBDIR} == "lib32" ]]; then
+		export DEFAULT_ABI="amd64"
+		export MULTILIB_ABIS="x86 amd64"
+		export CFLAGS_amd64=${CFLAGS_amd64:-"-m64"}
+		export CFLAGS_x86=${CFLAGS_x86-"-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"}
+		export CHOST_amd64="x86_64-pc-linux-gnu"
+		export CHOST_x86="i686-pc-linux-gnu"
+		export LIBDIR_amd64=${LIBDIR_amd64-${CONF_LIBDIR}}
+		export LIBDIR_x86=${LIBDIR_x86-${CONF_MULTILIBDIR}}
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+}
+
+abi_fail_check() {
+	local ABI=$1
+	if [[ ${ABI} == "x86" ]] ; then
+		echo
+		eerror "Building failed for ABI=x86!.  This usually means a broken"
+		eerror "multilib setup.  Please fix that before filling a bugreport"
+		eerror "against sandbox."
+		echo
+	fi
+}
+
+src_compile() {
+	local myconf
+	local iscross=0
+
+	setup_multilib
+
+	filter-lfs-flags #90228
+
+	has_multilib_profile && myconf="--enable-multilib"
+
+	ewarn "If configure fails with a 'cannot run C compiled programs' error, try this:"
+	ewarn "FEATURES=-sandbox emerge sandbox"
+
+	[[ -n ${CBUILD} && ${CBUILD} != ${CHOST} ]] && iscross=1
+
+	OABI=${ABI}
+	OCHOST=${CHOST}
+	for ABI in $(get_install_abis); do
+		mkdir "${WORKDIR}/build-${ABI}-${OCHOST}"
+		cd "${WORKDIR}/build-${ABI}-${OCHOST}"
+
+		# Needed for older broken portage versions (bug #109036)
+		portageq has_version "${ROOT}" '<portage-2.0.51.22' && \
+			unset EXTRA_ECONF
+
+		export ABI
+		export CHOST=$(get_abi_CHOST)
+		[[ ${iscross} == 0 ]] && export CBUILD=${CHOST}
+
+		einfo "Configuring sandbox for ABI=${ABI}..."
+		ECONF_SOURCE="../${P}/" \
+		econf --libdir="/usr/$(get_libdir)" ${myconf}
+		einfo "Building sandbox for ABI=${ABI}..."
+		emake || {
+			abi_fail_check "${ABI}"
+			die "emake failed for ${ABI}"
+		}
+	done
+	ABI=${OABI}
+	CHOST=${OCHOST}
+}
+
+src_install() {
+	setup_multilib
+
+	OABI=${ABI}
+	for ABI in $(get_install_abis); do
+		cd "${WORKDIR}/build-${ABI}-${CHOST}"
+		einfo "Installing sandbox for ABI=${ABI}..."
+		make DESTDIR="${D}" install || die "make install failed for ${ABI}"
+	done
+	ABI=${OABI}
+
+	keepdir /var/log/sandbox
+	fowners root:portage /var/log/sandbox
+	fperms 0770 /var/log/sandbox
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_preinst() {
+	chown root:portage ${IMAGE}/var/log/sandbox
+	chmod 0770 ${IMAGE}/var/log/sandbox
+}