[patch] diff -u of old new for both ebuilds

confix.patch (text/plain), 3.48 KB, created by Ian Delaney (RETIRED) on 2015-02-21 10:56:12 UTC

--- confix-2.3.5-r1.ebuild	2011-01-09 04:50:31.000000000 +0800
+++ confix-2.3.5-r2.ebuild	2015-02-21 18:52:06.056668153 +0800
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/confix/confix-2.3.5-r1.ebuild,v 1.2 2011/01/08 20:50:31 arfrever Exp $
 
-EAPI=3
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+EAPI=5
 
-inherit distutils eutils
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
 
 DESCRIPTION="Confix: A Build Tool on Top of GNU Automake"
 HOMEPAGE="http://confix.sourceforge.net"
@@ -26,19 +26,19 @@
 
 S="${WORKDIR}/Confix-${PV}"
 
-PYTHON_MODNAME="libconfix"
-
-src_prepare() {
-	# find jni-include dirs on hpux.
-	epatch "${FILESDIR}"/2.1.0/jni-hpux.patch
+PATCHES=( # find jni-include dirs on hpux.
+	"${FILESDIR}"/2.1.0/jni-hpux.patch
 	# add .exe extension to TESTS
-	epatch "${FILESDIR}"/2.3.0/exeext.patch
+	"${FILESDIR}"/2.3.0/exeext.patch
 	# use external autoconf archive
-	epatch "${FILESDIR}"/2.3.0/ext-ac-archive.patch
+	"${FILESDIR}"/2.3.0/ext-ac-archive.patch
 	# link local libraries first.
-	epatch "${FILESDIR}"/2.3.0/local-libs-first.patch
+	"${FILESDIR}"/2.3.0/local-libs-first.patch
 	# don't use automake 1.9, but any newer too...
-	epatch "${FILESDIR}"/2.3.0/new-automake.patch
+	"${FILESDIR}"/2.3.0/new-automake.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
 }
 
 pkg_preinst() {

--- confix-2.3.5-r1.ebuild	2011-01-09 04:50:31.000000000 +0800
+++ confix-9999.ebuild	2015-02-21 18:53:59.062541659 +0800
@@ -1,21 +1,22 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/confix/confix-2.3.5-r1.ebuild,v 1.2 2011/01/08 20:50:31 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/confix/confix-9999.ebuild,v 1.7 2013/11/05 14:29:15 haubi Exp $
 
-EAPI=3
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+EAPI=5
 
-inherit distutils eutils
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 subversion
 
 DESCRIPTION="Confix: A Build Tool on Top of GNU Automake"
 HOMEPAGE="http://confix.sourceforge.net"
-SRC_URI="mirror://sourceforge/confix/Confix-${PV}.tar.bz2"
+ESVN_REPO_URI="http://svn.code.sf.net/p/confix/svn/confix/trunk"
+ESVN_PROJECT="${PN}"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~amd64 ~x86 ~ppc-aix ~hppa-hpux ~ia64-hpux ~x86-interix ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS=""
 IUSE=""
 
 DEPEND=""
@@ -24,21 +25,19 @@
 	sys-devel/automake
 	sys-devel/libtool"
 
-S="${WORKDIR}/Confix-${PV}"
-
-PYTHON_MODNAME="libconfix"
-
-src_prepare() {
-	# find jni-include dirs on hpux.
-	epatch "${FILESDIR}"/2.1.0/jni-hpux.patch
+PATCHES=( # find jni-include dirs on hpux.
+	"${FILESDIR}"/2.1.0/jni-hpux.patch
 	# add .exe extension to TESTS
-	epatch "${FILESDIR}"/2.3.0/exeext.patch
+	"${FILESDIR}"/2.3.0/exeext.patch
 	# use external autoconf archive
-	epatch "${FILESDIR}"/2.3.0/ext-ac-archive.patch
+	"${FILESDIR}"/2.3.0/ext-ac-archive.patch
 	# link local libraries first.
-	epatch "${FILESDIR}"/2.3.0/local-libs-first.patch
+	"${FILESDIR}"/2.3.0/local-libs-first.patch
 	# don't use automake 1.9, but any newer too...
-	epatch "${FILESDIR}"/2.3.0/new-automake.patch
+	"${FILESDIR}"/2.3.0/new-automake.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
 }
 
 pkg_preinst() {