added new version, update live ebuild

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 105 insertions, 28 deletions

diff --git a/dev-util/confix/ChangeLog b/dev-util/confix/ChangeLog
index ca71c48c653a..5b409e193ba3 100644
--- a/dev-util/confix/ChangeLog
+++ b/dev-util/confix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/confix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/confix/ChangeLog,v 1.15 2010/10/11 12:45:54 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/confix/ChangeLog,v 1.16 2010/10/29 12:05:41 mduft Exp $
+
+*confix-2.3.5 (29 Oct 2010)
+
+  29 Oct 2010; Markus Duft <mduft@gentoo.org> +confix-2.3.5.ebuild,
+  confix-9999.ebuild:
+  add new version, update/fix live ebuild
 
   11 Oct 2010; Michael Haubenwallner <haubi@gentoo.org>
   confix-2.1.0-r4.ebuild:
diff --git a/dev-util/confix/Manifest b/dev-util/confix/Manifest
index a67536187ce8..5273d022f49d 100644
--- a/dev-util/confix/Manifest
+++ b/dev-util/confix/Manifest
@@ -11,9 +11,11 @@ AUX 2.3.0/local-libs-first.patch 1871 RMD160 b078d7a27697b054e54fdce679b240a69b2
 AUX 2.3.0/new-automake.patch 573 RMD160 188d27734e55b4ea92dbff7a7b7e04bb2d55daaa SHA1 1812a618794ebdebf73c08f8fb7546b88fb94ba2 SHA256 28190dc46beee0f163a9f64d8e523232d73864948cc06e9e9e35b98645df160e
 DIST Confix-2.1.0.tar.bz2 977383 RMD160 f83dc809b674cf7cfc78ad2a6a843c8bba9cc43a SHA1 837a8db0ca59c451289661f012eb227ccc8fda08 SHA256 ba4c4278e6bf1bf74503935fb394a2c045d122afebde52d863b040fba6e7104f
 DIST Confix-2.3.0.tar.bz2 677643 RMD160 cc2f98a798e5a1dc8004bf4ed26ff4ac621e54d0 SHA1 30eb92b8bd87dc92784b45f07d5531870fe525fc SHA256 4f8426b37a8d3ca5bfae0063d678cfdbb16c03771f3fc7a2847e1cda997b56f4
+DIST Confix-2.3.5.tar.bz2 678133 RMD160 8e1930ede4fef92af297fffe0d93a414e58d66b7 SHA1 2e9cd652be5feff183dbdb7d3275a4117e6766de SHA256 b1a2814526c908ab32d6cfd3f0e8b8105c925a7e8ac1802c4b0856d44a2a9916
 EBUILD confix-2.1.0-r4.ebuild 2873 RMD160 773230ace588af1ec70f796f66a0a652bfd4a900 SHA1 9107cb13d148426d67b87714800e14f68c0b92e8 SHA256 5eee8792cd0dcf1e8fd663c551166f534d0f22181f6e84d405ac078f84bbad6c
 EBUILD confix-2.1.0.ebuild 1492 RMD160 6062580103a1ab5895dd1ae2245f72a1cff933ed SHA1 991014a2f9b3e4e5b2a9d2a79b97ffbd91570f89 SHA256 9a4fec08532924d8a45d3cc139000c71f75cf468d8273f07f42a0c711c31e3aa
 EBUILD confix-2.3.0-r3.ebuild 2674 RMD160 5be230898f1c6bb0027c33702e75fc693a8ddf13 SHA1 47716ba32c89332327d86ad664e063e2f11d7ae5 SHA256 2464d6cc02ab7eda3e4560a0ee3bb5f00ecfc617a87d8edf75c093cb50e161b2
-EBUILD confix-9999.ebuild 1876 RMD160 13f5dde375bf60ecd0636c68d52d115154c60388 SHA1 7f0d7cbeb52297d7e3db7ac1c989eeea19667692 SHA256 9db163110f357c7b746b1c11860f228ee4bdd9b7be54c07985b39223dc2f2193
-MISC ChangeLog 3067 RMD160 2e65300bab91ed16090ba5c860fc46b6d0496cac SHA1 9a06b5f73e43e2553f6e9e8b43140f2f04a88248 SHA256 05ec94a43cdf5d8d6199a151f74c8c6a9e82f592ba79f66cae2cbc0113f42859
+EBUILD confix-2.3.5.ebuild 2108 RMD160 72cca5ab38981bfb0dc705b6e094508d9f5ff38f SHA1 e5f8ba838be46dd9aa95bdb288804d5475d13d7b SHA256 8b55126620f06cd9f5a268dfb779b7b71ef575a7f2ad2a38f5fce098f82c64a2
+EBUILD confix-9999.ebuild 2044 RMD160 b82ff1d50aa3ee9fdb110440bfa692005a79f158 SHA1 31973b876474a9bfd48ba2af392081b303c140aa SHA256 d9f4cac82d107e8db72aac2f12cb4d7640b9830b42ea838dc55153c86941a7ab
+MISC ChangeLog 3229 RMD160 18ab4ba75bf4fefa4bae51ece2261b6585dc7ef3 SHA1 7c3c35d2a28a4bc4440a9a1ced073317ea13fe08 SHA256 d647999d0102c206e05895da94ef90d35c65f8daa4c8abe193f04cd66fed35d4
 MISC metadata.xml 310 RMD160 8705c05dd91101641c0c967f040cf8c6de36f5e0 SHA1 255e1d97639f0f1698d667d23273797d05ac034d SHA256 05b48b7bd20b100b293a45dd84f1d9e7beeb52409327248b0d5ad242e0d9d2e5
diff --git a/dev-util/confix/confix-2.3.5.ebuild b/dev-util/confix/confix-2.3.5.ebuild
new file mode 100644
index 000000000000..2bffb6bbb711
--- /dev/null
+++ b/dev-util/confix/confix-2.3.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2010 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.ebuild,v 1.1 2010/10/29 12:05:41 mduft Exp $
+
+EAPI=3
+
+inherit distutils
+
+DESCRIPTION="Confix: A Build Tool on Top of GNU Automake"
+HOMEPAGE="http://confix.sourceforge.net"
+SRC_URI="mirror://sourceforge/confix/Confix-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~x86 ~ppc-aix ~hppa-hpux ~ia64-hpux ~x86-interix ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-lang/python"
+RDEPEND="${DEPEND}
+	sys-devel/automake
+	sys-devel/libtool
+	sys-devel/autoconf-archive
+	dev-util/confix-wrapper
+"
+
+S="${WORKDIR}/Confix-${PV}"
+PYTHON_MODNAME="libconfix tests"
+
+src_prepare() {
+	# find jni-include dirs on hpux.
+	epatch "${FILESDIR}"/2.1.0/jni-hpux.patch
+	# add .exe extension to TESTS
+	epatch "${FILESDIR}"/2.3.0/exeext.patch
+	# use external autoconf archive
+	epatch "${FILESDIR}"/2.3.0/ext-ac-archive.patch
+	# link local libraries first.
+	epatch "${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
+}
+
+pkg_preinst() {
+	local RV=2.3.0
+
+	if has_version "<dev-util/confix-${RV}"; then
+		einfo "After merging ${P} you might have to remerge all packages built"
+		einfo "with <dev-util/confix-${RV} in your EPREFIX to get all the"
+		einfo "repo files useable with current ${PN}".
+		ewarn
+		ewarn "Use this command (copy&paste) to identify packages built with confix"
+		ewarn "needing a remerge in your particular instance of Gentoo Prefix:"
+		ewarn
+		# use 'echo' to get this command from here:
+		ewarn "( cd \$(portageq envvar EPREFIX)/var/db/pkg || exit 1;" \
+			  "pattern=\$(cd ../../.. && echo \$(ls -d" \
+			  "usr/share/confix*/repo | grep -v confix-${RV}) |" \
+			  "sed -e 's, ,|,g'); if [[ -z \${pattern} ]]; then echo" \
+			  "'No more packages were built with broken Confix.'; exit 0;" \
+			  "fi; emerge --ask --oneshot \$(grep -lE \"(\${pattern})\"" \
+			  "*/*/CONTENTS | sed -e 's,^,>=,;s,/CONTENTS,,')" \
+			  ")"
+		ewarn
+	fi
+}
diff --git a/dev-util/confix/confix-9999.ebuild b/dev-util/confix/confix-9999.ebuild
index ad9a40ec151e..2ed6f3ce3097 100644
--- a/dev-util/confix/confix-9999.ebuild
+++ b/dev-util/confix/confix-9999.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/confix/confix-9999.ebuild,v 1.4 2010/07/13 11:57:23 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/confix/confix-9999.ebuild,v 1.5 2010/10/29 12:05:41 mduft Exp $
 
-EAPI=2
+EAPI=3
 
 inherit eutils distutils subversion
 
 DESCRIPTION="Confix: A Build Tool on Top of GNU Automake"
 HOMEPAGE="http://confix.sourceforge.net"
-
 ESVN_REPO_URI="https://confix.svn.sourceforge.net/svnroot/confix/confix/trunk"
 ESVN_PROJECT="${PN}"
 
@@ -30,30 +29,36 @@ PYTHON_MODNAME="libconfix tests"
 src_prepare() {
 	# find jni-include dirs on hpux.
 	epatch "${FILESDIR}"/2.1.0/jni-hpux.patch
-	# hack to ignore duplicate files in rescan
-# does not apply to trunk anymore
-#	epatch "${FILESDIR}"/2.1.0/CALL_RESCAN_HACK.patch
 	# add .exe extension to TESTS
 	epatch "${FILESDIR}"/2.3.0/exeext.patch
 	# use external autoconf archive
 	epatch "${FILESDIR}"/2.3.0/ext-ac-archive.patch
-	# enable SET_FILE_PROPERTIES(file, { 'PRIVATE_CINCLUDE', 1 })
-# does not apply to trunk anymore
-#	epatch "${FILESDIR}"/2.1.0/private-headers.patch
-	# enable fast installation rules.
-# does not apply to trunk anymore
-#	epatch "${FILESDIR}"/2.1.0/fast-install.patch
-
-	# need to store repos in exact versioned share/confix-PV/repo
-	sed -i -e "s,\<confix2\>,confix-${PV}," \
-		libconfix/plugins/automake/repo_automake.py \
-		libconfix/core/machinery/repo.py \
-		libconfix/plugins/cmake/consts.py \
-	|| die "cannot adjust repo dir"
-
-	# adjust version-printing to have same version as share/confix-PV/repo,
-	# to ease revdep-rebuild-alike scripts for rebuilding confix-packages.
-	sed -i -e "/^CONFIX_VERSION[ 	]*=/s,.*,CONFIX_VERSION = '${PV}'," \
-		libconfix/core/utils/const.py \
-	|| die "cannot adjust confix version"
+	# link local libraries first.
+	epatch "${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
+}
+
+pkg_preinst() {
+	local RV=2.3.0
+
+	if has_version "<dev-util/confix-${RV}"; then
+		einfo "After merging ${P} you might have to remerge all packages built"
+		einfo "with <dev-util/confix-${RV} in your EPREFIX to get all the"
+		einfo "repo files useable with current ${PN}".
+		ewarn
+		ewarn "Use this command (copy&paste) to identify packages built with confix"
+		ewarn "needing a remerge in your particular instance of Gentoo Prefix:"
+		ewarn
+		# use 'echo' to get this command from here:
+		ewarn "( cd \$(portageq envvar EPREFIX)/var/db/pkg || exit 1;" \
+			  "pattern=\$(cd ../../.. && echo \$(ls -d" \
+			  "usr/share/confix*/repo | grep -v confix-${RV}) |" \
+			  "sed -e 's, ,|,g'); if [[ -z \${pattern} ]]; then echo" \
+			  "'No more packages were built with broken Confix.'; exit 0;" \
+			  "fi; emerge --ask --oneshot \$(grep -lE \"(\${pattern})\"" \
+			  "*/*/CONTENTS | sed -e 's,^,>=,;s,/CONTENTS,,')" \
+			  ")"
+		ewarn
+	fi
 }