public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-portage/gentoolkit: ChangeLog gentoolkit-9999.ebuild gentoolkit-0.3.0.7.ebuild
@ 2013-01-02 22:56 Paul Varner (fuzzyray)
  0 siblings, 0 replies; only message in thread
From: Paul Varner (fuzzyray) @ 2013-01-02 22:56 UTC (permalink / raw
  To: gentoo-commits

fuzzyray    13/01/02 22:56:29

  Modified:             ChangeLog gentoolkit-9999.ebuild
                        gentoolkit-0.3.0.7.ebuild
  Log:
  Migrate gentoolkit-9999 to distutils-r1 eclass.
  Change einfo to elog, but only call elog if it is a new install.
  
  (Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 0x4D269A1B)

Revision  Changes    Path
1.290                app-portage/gentoolkit/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/ChangeLog?rev=1.290&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/ChangeLog?rev=1.290&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/ChangeLog?r1=1.289&r2=1.290

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- ChangeLog	29 Dec 2012 17:47:01 -0000	1.289
+++ ChangeLog	2 Jan 2013 22:56:29 -0000	1.290
@@ -1,6 +1,10 @@
 # ChangeLog for app-portage/gentoolkit
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.289 2012/12/29 17:47:01 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.290 2013/01/02 22:56:29 fuzzyray Exp $
+
+  02 Jan 2013; Paul Varner <fuzzyray@gentoo.org> gentoolkit-9999.ebuild:
+  Migrate gentoolkit-9999 to distutils-r1 eclass.
+  Change einfo to elog, but only call elog if it is a new install.
 
   29 Dec 2012; Raúl Porcel <armin76@gentoo.org> gentoolkit-0.3.0.7.ebuild:
   alpha/m68k/s390/sh/sparc stable wrt #446832



1.26                 app-portage/gentoolkit/gentoolkit-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/gentoolkit-9999.ebuild?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/gentoolkit-9999.ebuild?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/gentoolkit-9999.ebuild?r1=1.25&r2=1.26

Index: gentoolkit-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-9999.ebuild,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gentoolkit-9999.ebuild	13 Nov 2012 21:59:47 -0000	1.25
+++ gentoolkit-9999.ebuild	2 Jan 2013 22:56:29 -0000	1.26
@@ -1,17 +1,16 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-9999.ebuild,v 1.25 2012/11/13 21:59:47 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-9999.ebuild,v 1.26 2013/01/02 22:56:29 fuzzyray Exp $
 
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45]"
-PYTHON_USE_WITH="xml"
-PYTHON_NONVERSIONED_EXECUTABLES=(".*")
+EAPI="5"
+
+PYTHON_COMPAT=(python{2_6,2_7,3_1,3_2,3_3} pypy1_9 )
+PYTHON_REQ_USE="xml"
 
 EGIT_MASTER="gentoolkit"
 EGIT_BRANCH="gentoolkit"
 
-inherit distutils python git-2
+inherit distutils-r1 git-2
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/gentoolkit.git"
 
@@ -25,34 +24,24 @@
 
 KEYWORDS=""
 
-# Note: dev-lang/python dependencies are so emerge will print a blocker if any
-# installed slot of python is not built with +xml.  This is used since
-# PYTHON_USE_WITH just dies in the middle of the emerge. See bug 399331.
 DEPEND="sys-apps/portage"
 RDEPEND="${DEPEND}
-	>=dev-lang/python-2.6[xml]
-	!>=dev-lang/python-2.6[-xml]
 	!<=app-portage/gentoolkit-dev-0.2.7
 	|| ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin )
 	sys-apps/gawk
 	sys-apps/grep
-	virtual/python-argparse"
-
-distutils_src_compile_pre_hook() {
-	echo VERSION="9999-${EGIT_VERSION}" "$(PYTHON)" setup.py set_version
-	VERSION="9999-${EGIT_VERSION}" "$(PYTHON)" setup.py set_version
-}
+	virtual/python-argparse[${PYTHON_USEDEP}]"
 
-src_compile() {
-	distutils_src_compile
+python_prepare_all() {
+	python_export_best
+	echo VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
+	VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
 }
 
-src_install() {
-	python_convert_shebangs -r "" build-*/scripts-*
-	distutils_src_install
+python_install_all() {
+	distutils-r1_python_install_all
 
 	# Create cache directory for revdep-rebuild
-	dodir /var/cache/revdep-rebuild
 	keepdir /var/cache/revdep-rebuild
 	use prefix || fowners root:root /var/cache/revdep-rebuild
 	fperms 0700 /var/cache/revdep-rebuild
@@ -72,20 +61,21 @@
 }
 
 pkg_postinst() {
-	distutils_pkg_postinst
-
-	einfo
-	einfo "For further information on gentoolkit, please read the gentoolkit"
-	einfo "guide: http://www.gentoo.org/doc/en/gentoolkit.xml"
-	einfo
-	einfo "Another alternative to equery is app-portage/portage-utils"
-	einfo
-	einfo "Additional tools that may be of interest:"
-	einfo
-	einfo "    app-admin/eclean-kernel"
-	einfo "    app-portage/diffmask"
-	einfo "    app-portage/flaggie"
-	einfo "    app-portage/install-mask"
-	einfo "    app-portage/portpeek"
-	einfo "    app-portage/smart-live-rebuild"
+	# Only show the elog information on a new install
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "For further information on gentoolkit, please read the gentoolkit"
+		elog "guide: http://www.gentoo.org/doc/en/gentoolkit.xml"
+		elog
+		elog "Another alternative to equery is app-portage/portage-utils"
+		elog
+		elog "Additional tools that may be of interest:"
+		elog
+		elog "    app-admin/eclean-kernel"
+		elog "    app-portage/diffmask"
+		elog "    app-portage/flaggie"
+		elog "    app-portage/install-mask"
+		elog "    app-portage/portpeek"
+		elog "    app-portage/smart-live-rebuild"
+	fi
 }



1.9                  app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild?r1=1.8&r2=1.9

Index: gentoolkit-0.3.0.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gentoolkit-0.3.0.7.ebuild	29 Dec 2012 17:47:01 -0000	1.8
+++ gentoolkit-0.3.0.7.ebuild	2 Jan 2013 22:56:29 -0000	1.9
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild,v 1.8 2012/12/29 17:47:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild,v 1.9 2013/01/02 22:56:29 fuzzyray Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"





^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2013-01-02 22:56 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-02 22:56 [gentoo-commits] gentoo-x86 commit in app-portage/gentoolkit: ChangeLog gentoolkit-9999.ebuild gentoolkit-0.3.0.7.ebuild Paul Varner (fuzzyray)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox