Fix python dependencies and re-add arches, making repoman happy

9 files changed, 74 insertions, 32 deletions

diff --git a/dev-cpp/cpplint/ChangeLog b/dev-cpp/cpplint/ChangeLog
index d2207ab6..025756f0 100644
--- a/dev-cpp/cpplint/ChangeLog
+++ b/dev-cpp/cpplint/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cpplint-141-r1 (18 Jan 2015)
+
+  18 Jan 2014; Martin Väth <martin@mvath.de>:
+  Use new-style python dependency. Fix shebang
+
 *cpplint-141 (05 Dec 2014)
 
   05 Dec 2014; Martin Väth <martin@mvath.de>:
diff --git a/dev-cpp/cpplint/cpplint-141.ebuild b/dev-cpp/cpplint/cpplint-141-r1.ebuild
index 7d7eb23e..195c19a2 100644
--- a/dev-cpp/cpplint/cpplint-141.ebuild
+++ b/dev-cpp/cpplint/cpplint-141-r1.ebuild
@@ -3,7 +3,8 @@
 # $Header: $
 
 EAPI=5
-inherit elisp-common eutils
+PYTHON_COMPAT=( jython2_{5,7} pypy{,3} python{2_7,3_{3,4}} )
+inherit elisp-common eutils python-r1
 RESTRICT="mirror"
 
 SUBVERSION_REVISION="r=${PV}"
@@ -23,9 +24,12 @@ KEYWORDS="~amd64 ~x86"
 IUSE="emacs"
 
 EMACSNAME="google-c-style"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 COMMON="emacs? ( virtual/emacs )"
 DEPEND="${COMMON}"
 RDEPEND="dev-lang/python
+	${PYTHON_DEPS}
 	${COMMON}"
 
 S="${WORKDIR}"
@@ -52,6 +56,9 @@ EOF
 }
 
 src_prepare() {
+	use prefix || sed -i \
+		-e '1s"^#!/usr/bin/env python$"#!'"${EPREFIX}/usr/bin/python"'"' \
+		-- "${PN}.py" || die
 	epatch_user
 }
 
diff --git a/dev-util/ccache/ccache-99999999-r3.ebuild b/dev-util/ccache/ccache-99999999-r3.ebuild
index 811a0952..99842099 100644
--- a/dev-util/ccache/ccache-99999999-r3.ebuild
+++ b/dev-util/ccache/ccache-99999999-r3.ebuild
@@ -11,6 +11,7 @@ inherit autotools eutils git-r3 readme.gentoo
 DESCRIPTION="fast compiler cache"
 HOMEPAGE="http://ccache.samba.org/"
 
+SRC_URI=""
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
@@ -41,13 +42,13 @@ src_install() {
 
 	DOC_CONTENTS="
 To use ccache with **non-Portage** C compiling, add
-${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}usr/bin.
+'${EPREFIX}/usr/lib/ccache/bin' to the beginning of your path, before '${EPREFIX}/usr/bin'.
 Portage 2.0.46-r11+ will automatically take advantage of ccache with
 no additional steps.  If this is your first install of ccache, type
-something like this to set a maximum cache size of 2GB:\\n
-# ccache -M 2G\\n
-If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
-# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
+something like this to set a maximum cache size of 2GB:
+# ccache -M 2G
+If you are upgrading from an older version than 3.x you should clear all of your caches like so:
+# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C
 ccache now supports sys-devel/clang and dev-lang/icc, too!"
 
 	readme.gentoo_create_doc
diff --git a/dev-util/pyrep/ChangeLog b/dev-util/pyrep/ChangeLog
index 3ee79ffe..03d515b6 100644
--- a/dev-util/pyrep/ChangeLog
+++ b/dev-util/pyrep/ChangeLog
@@ -2,7 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-*pyrep-1.4 (10 Aug 2043)
+*pyrep-1.4-r1 (18 Jan 2015)
+
+  18 Jan 2015; Martin Väth <martin@mvath.de>:
+  Use new-style python dependency
+
+*pyrep-1.4 (10 Aug 2014)
 
   10 Aug 2014; Martin Väth <martin@mvath.de>:
   Version bump, remove old ebuild
diff --git a/dev-util/pyrep/pyrep-1.4.ebuild b/dev-util/pyrep/pyrep-1.4-r1.ebuild
index 24589512..71807f45 100644
--- a/dev-util/pyrep/pyrep-1.4.ebuild
+++ b/dev-util/pyrep/pyrep-1.4-r1.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=5
 RESTRICT="mirror"
-inherit eutils
+PYTHON_COMPAT=( jython2_{5,7} pypy{,3} python{2_7,3_{3,4}} )
+inherit eutils python-r1
 
 DESCRIPTION="Search and/or replace regular expressions within many files interactively"
 HOMEPAGE="https://github.com/vaeth/pyrep/"
@@ -15,7 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-lang/python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="${PYTHON_DEPS}"
 
 src_prepare() {
 	use prefix || sed -i \
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0b70908c..decadeb3 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -119,7 +119,6 @@ sys-process/systemd-cron:etc-crontab - Use /etc/crontab; disable this when you h
 sys-process/systemd-cron:minutely - Enable systemd minutely cron target
 sys-process/systemd-cron:setgid - Install a cron setgid helper to allow users editing crontabs
 sys-process/systemd-cron:yearly - Enable systemd yearly/semi-annually/quarterly cron target
-x11-drivers/nvidia-drivers:X - Install the X.org driver, OpenGL libraries, XvMC libraries, and VDPAU libraries
 x11-drivers/nvidia-drivers:kernel3-13 - Install unofficial patches for linux-3.13 and newer
 x11-drivers/nvidia-drivers:kernel3-14 - Install unofficial patches for linux-3.14 and newer
 x11-drivers/nvidia-drivers:kernel3-17 - Install unofficial patches for linux-3.17 and newer
diff --git a/sys-apps/lesspipe/ChangeLog b/sys-apps/lesspipe/ChangeLog
index 84cdd296..54ef8dbd 100644
--- a/sys-apps/lesspipe/ChangeLog
+++ b/sys-apps/lesspipe/ChangeLog
@@ -4,6 +4,9 @@
 
 *lesspipe-1.82 (24 Dec 2013)
 
+  18 Jam 2015; Martin Väth <martin@mvath.de>:
+  Re-add arches and fix dependencies properly
+
   24 Sep 2014; Martin Väth <martin@mvath.de>:
   Fix dependencies. Remove some arches to make repoman happy
 
diff --git a/sys-apps/lesspipe/lesspipe-1.82.ebuild b/sys-apps/lesspipe/lesspipe-1.82.ebuild
index 6b826b43..788e77e1 100644
--- a/sys-apps/lesspipe/lesspipe-1.82.ebuild
+++ b/sys-apps/lesspipe/lesspipe-1.82.ebuild
@@ -13,13 +13,25 @@ SRC_URI="http://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~m68k ~mips ~ppc ~s390 ~sh ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="antiword cabextract catdoc +cpio +djvu dpkg +dvi2tty +elinks fastjar +ghostscript gpg +groff +html2text id3v2 image isoinfo libplist +links +lynx lzip mp3info mp3info2 ooffice p7zip pdf pstotext rar rpm +rpm2targz unrar unrtf +unzip +w3m xlhtml"
 
 htmlmode="( || ( html2text links lynx elinks w3m ) )"
 REQUIRED_USE="!rpm2targz? ( rpm? ( cpio ) )
 	ooffice? ${htmlmode}
-	xlhtml? ${htmlmode}"
+	xlhtml? ${htmlmode}
+	amd64-fbsd? ( !antiword !catdoc !dpkg !elinks !fastjar !html2text
+		!id3v2 !lzip !mp3info !mp3info2 !ooffice !p7zip !pstotext
+		!rar !rpm !unrtf !w3m !xlhtml )
+	alpha? ( !catdoc !fastjar !id3v2 !libplist !mp3info !mp3info2
+		!ooffice !pstotext !rar )
+	arm? ( !antiword !catdoc !fastjar !html2text !id3v2 !mp3info
+		!ooffice !pstotext !rar !xlhtml )
+	hppa? ( !catdoc !fastjar !libplist !mp3info2 !ooffice !rar !w3m !xlhtml )
+	ia64? ( !antiword !catdoc !fastjar !id3v2 !libplist !mp3info !mp3info2
+		!ooffice !pstotext !rar !xlhtml )
+	ppc64? ( !catdoc !fastjar !ooffice !xlhtml )
+	sparc? ( !catdoc !fastjar !id3v2 !libplist !mp3info2 !ooffice !pstotext )"
 
 RDEPEND="sys-apps/file
 	app-arch/xz-utils
@@ -27,24 +39,26 @@ RDEPEND="sys-apps/file
 	dev-lang/perl
 	sys-apps/less[lesspipe]
 	unzip? ( app-arch/unzip )
-	fastjar? ( app-arch/fastjar )
+	fastjar? ( !amd64-fbsd? ( !alpha? ( !arm? ( !hppa? ( !ia64? ( !ppc64?
+		( !sparc? ( app-arch/fastjar ) ) ) ) ) ) ) )
 	unrar? ( app-arch/unrar )
 	!unrar? (
-		rar? ( app-arch/rar )
+		rar? ( !amd64-fbsd? ( !alpha? ( !arm? ( !hppa? ( !ia64?
+			( app-text/o3read ) ) ) ) ) )
 	)
-	lzip? ( app-arch/lzip )
-	p7zip? ( app-arch/p7zip )
+	lzip? ( !amd64-fbsd? ( app-arch/lzip ) )
+	p7zip? ( !amd64-fbsd? ( app-arch/p7zip ) )
 	cpio? ( app-arch/cpio )
 	cabextract? ( app-arch/cabextract )
-	html2text? ( app-text/html2text )
+	html2text? ( !amd64-fbsd? ( !arm? ( app-text/html2text ) ) )
 	!html2text? (
 		links? ( www-client/links )
 		!links? (
 			lynx? ( www-client/lynx )
 			!lynx? (
-				elinks? ( www-client/elinks )
+				elinks? ( !amd64-fbsd? ( www-client/elinks ) )
 				!elinks? (
-					w3m? ( www-client/w3m )
+					w3m? ( !amd64-fbsd? ( !hppa? ( www-client/w3m ) ) )
 				)
 			)
 		)
@@ -52,34 +66,41 @@ RDEPEND="sys-apps/file
 	groff? ( sys-apps/groff )
 	rpm2targz? ( app-arch/rpm2targz )
 	!rpm2targz? (
-		rpm? ( || ( app-arch/rpm app-arch/rpm5 ) )
+		rpm? ( !amd64-fbsd? ( || ( app-arch/rpm app-arch/rpm5 ) ) )
 	)
-	antiword? ( app-text/antiword )
+	antiword? ( !amd64-fbsd? ( !arm? ( !ia64? ( app-text/antiword ) ) ) )
 	!antiword? (
-		catdoc? ( app-text/catdoc )
+		catdoc? ( !amd64-fbsd? ( !alpha? ( !arm? ( !hppa? ( !ia64? ( !ppc64?
+			( !sparc? ( app-text/catdoc ) ) ) ) ) ) ) )
 	)
-	xlhtml? ( app-text/xlhtml )
-	unrtf? ( app-text/unrtf )
-	ooffice? ( app-text/o3read )
+	xlhtml? ( !amd64-fbsd? ( !arm? ( !hppa? ( !ia64? ( !ppc64?
+		( app-text/xlhtml ) ) ) ) ) )
+	unrtf? ( !amd64-fbsd? ( app-text/unrtf ) )
+	ooffice? ( !amd64-fbsd? ( !alpha? ( !arm? ( !hppa? ( !ia64? ( !ppc64?
+		( !sparc? ( app-text/o3read ) ) ) ) ) ) ) )
 	djvu? ( app-text/djvu )
 	dvi2tty? ( dev-tex/dvi2tty )
-	pstotext? ( app-text/pstotext )
+	pstotext? ( !amd64-fbsd? ( !alpha? ( !arm? ( !ia64? ( !sparc?
+		( app-text/pstotext ) ) ) ) ) )
 	!pstotext? (
 		ghostscript? ( app-text/ghostscript-gpl )
 	)
 	gpg? ( app-crypt/gnupg )
 	pdf? ( app-text/poppler )
-	id3v2? ( media-sound/id3v2 )
+	id3v2? ( !amd64-fbsd? ( !alpha? ( !arm? ( !ia64? ( !sparc?
+		( media-sound/id3v2 ) ) ) ) ) )
 	!id3v2? (
-		mp3info2? ( dev-perl/MP3-Tag )
+		mp3info2? ( !amd64-fbsd? ( !alpha? ( !hppa? ( !ia64? ( !sparc?
+			( dev-perl/MP3-Tag ) ) ) ) ) )
 		!mp3info2? (
-			mp3info? ( media-sound/mp3info )
+			mp3info? ( !amd64-fbsd? ( !alpha? ( !arm? ( !ia64?
+				( media-sound/mp3info ) ) ) ) )
 		)
 	)
 	image? ( || ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick ) )
 	isoinfo? ( || ( app-cdr/cdrtools app-cdr/dvd+rw-tools app-cdr/cdrkit ) )
-	libplist? ( app-pda/libplist )
-	dpkg? ( app-arch/dpkg )"
+	libplist? ( !alpha? ( !hppa? ( !ia64? ( !sparc? ( app-pda/libplist ) ) ) ) )
+	dpkg? ( !amd64-fbsd? ( app-arch/dpkg ) ) "
 DEPEND="${RDEPEND}"
 
 ModifyStart() {
diff --git a/x11-drivers/nvidia-drivers/metadata.xml b/x11-drivers/nvidia-drivers/metadata.xml
index 50c853f0..d8e29e81 100644
--- a/x11-drivers/nvidia-drivers/metadata.xml
+++ b/x11-drivers/nvidia-drivers/metadata.xml
@@ -5,7 +5,6 @@
   <email>jer@gentoo.org</email>
 </maintainer>
 <use>
-	<flag name='X'>Install the X.org driver, OpenGL libraries, XvMC libraries, and VDPAU libraries</flag>
 	<flag name='kernel3-13'>Install unofficial patches for linux-3.13 and newer</flag>
 	<flag name='kernel3-14'>Install unofficial patches for linux-3.14 and newer</flag>
 	<flag name='kernel3-17'>Install unofficial patches for linux-3.17 and newer</flag>