Ebuild cleanup, fixed parallel build. Added myself into metadata.xml.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-openvz.git-35f41f1 i686

6 files changed, 201 insertions, 46 deletions

diff --git a/dev-libs/judy/ChangeLog b/dev-libs/judy/ChangeLog
index d4f327c9609a..88d8fd868688 100644
--- a/dev-libs/judy/ChangeLog
+++ b/dev-libs/judy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/judy
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/judy/ChangeLog,v 1.17 2008/03/24 17:58:06 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/judy/ChangeLog,v 1.18 2008/11/03 15:33:43 pva Exp $
+
+  03 Nov 2008; Peter Volkov <pva@gentoo.org>
+  +files/judy-1.0.4-parallel-make.patch, metadata.xml, -judy-1.0.1.ebuild,
+  judy-1.0.4.ebuild:
+  Ebuild cleanup, fixed parallel build. Added myself into metadata.xml.
 
 *judy-1.0.4 (24 Mar 2008)
 
diff --git a/dev-libs/judy/Manifest b/dev-libs/judy/Manifest
index 51aed084d11f..54284441b6e4 100644
--- a/dev-libs/judy/Manifest
+++ b/dev-libs/judy/Manifest
@@ -1,8 +1,7 @@
-DIST Judy-1.0.1.tar.gz 1097648 RMD160 9053bdc1357b398528704ce6b2ee37ba2c4132c6 SHA1 1e0de7c8bb834d63d4dbb097cd644c97b13661a4 SHA256 3a3325a927d16cc3dadc3c0bf8bd8d072f7c6603b855fd384dcc85778c9473a5
+AUX judy-1.0.4-parallel-make.patch 6615 RMD160 6759258930c5ade81fa28fd0ff78396981564c0c SHA1 a8066fd06dba4b897e711e295745df8519eceb4f SHA256 00d44b13e934284d80d7a7529e030a5863f45516d0306ee35c94f0d769616c45
 DIST Judy-1.0.3.tar.gz 1132631 RMD160 bf2cd7e34f1480870cf7dc9a9a9ccde333e78d74 SHA1 106a8e78139ef6184b4f9848a6a5568fdc9614c4 SHA256 f486e0bf842a8515a80ef678b3b5f6eb82d50a7e4f4003544db8b10a9d7affd7
 DIST Judy-1.0.4.tar.gz 1142724 RMD160 f97aa8937dd5f774d6cd37ba3599795a9e794306 SHA1 ceb3d4be5572438a414f39db4ce0eb3735462130 SHA256 ac3e5c24ac48867543603e78238c7accad77cdd438846379091babfcb5d0c69b
-EBUILD judy-1.0.1.ebuild 678 RMD160 d807dc76165849afabaa7ccb3e38d45e3bc83acd SHA1 00ffd2655a4c77106c253cb4ff660c3e408e1187 SHA256 b175841608630e01bea4022f8bb80d69ae43c4dedb3556884b601eef452f45ec
 EBUILD judy-1.0.3.ebuild 700 RMD160 ee70f57fdf230fa55321d03e6a56228a336a319a SHA1 6557af327c231bb2e8446b7007a23fd105908ae5 SHA256 5044434034f3f5cc6481b9100f3289dfcc432bf107019ba21c2abd0e2b39deeb
-EBUILD judy-1.0.4.ebuild 816 RMD160 7799cad0f74982c71448e65ecf9ee193d810b66c SHA1 600bb27486010459cc477e18e3e8ba40609e612e SHA256 3fcbe374ab13c18dd48ecf00dd5176d091a5ca351a73d590ca698707f4701112
-MISC ChangeLog 2054 RMD160 13c2384fdf94731cc3d2425894526d2724a52cec SHA1 825369e405c6e3c2b2f031371c33785953536ecd SHA256 716485984304c5789e3c6cfac51c2d6e6bae148e5215fd1d29c52164a08bc0ec
-MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+EBUILD judy-1.0.4.ebuild 696 RMD160 7f7c19b1662f55cb6a76bb7e006824b2dd714d3c SHA1 91f7a16f8bc1f20cf0d988e727d4ce9943dd7f56 SHA256 6f12f1eae371c2674be7b3453efe58a089a53b50e943063678a2d1f2f5a35826
+MISC ChangeLog 2263 RMD160 fa92a4841fb93b73f2c4485fb2a7a8efcac8046a SHA1 825c580a93d2c425b92fe2eee2555ca6a3e0c3e1 SHA256 155c3a1e0dc90fcb014dcf74e62ef139fd4d5d69bdcfaeb10d6a0b7574ec6bc6
+MISC metadata.xml 250 RMD160 f27bc8272125f15d03c2bfc87e961842bdb303ae SHA1 c4991bbfca89085d81f56ed53f8b0c827a35a4f1 SHA256 68999dde540491efec63a8f47366dbc2d5f2c9f2c1211709d92366a56b6cd27d
diff --git a/dev-libs/judy/files/judy-1.0.4-parallel-make.patch b/dev-libs/judy/files/judy-1.0.4-parallel-make.patch
new file mode 100644
index 000000000000..23c3dcb4f0e5
--- /dev/null
+++ b/dev-libs/judy/files/judy-1.0.4-parallel-make.patch
@@ -0,0 +1,182 @@
+=== modified file 'doc/Makefile.am'
+--- doc/Makefile.am	2008-11-03 15:14:54 +0000
++++ doc/Makefile.am	2008-11-03 15:16:21 +0000
+@@ -94,114 +94,93 @@
+ 	    man/man3/JudyHSFreeArray
+ 
+ 
++dep_on_Judy = J1T J1S J1U J1F J1N J1L J1P J1FE J1NE J1LE J1PE J1C J1BC J1FA J1MU
++
++$(patsubst %,man/man3/%,$(dep_on_Judy)): man/man3/Judy
+ 
+ man/man3/Judy: 
+ 	../tool/jhton ext/Judy_3.htm | grep -v '^[   ]*$$' | sed -e 's/\.C//' >  man/man3/Judy
++	cd man/man3 && \
++	for man in $(dep_on_Judy); do \
++		ln -s Judy $$man; \
++	done
+ 
+ man/man3/Judy1:
+ 	../tool/jhton ext/Judy1_3.htm | grep -v '^[   ]*$$' | sed -e 's/\.C//' > man/man3/Judy1
+-	cd man/man3; ln -s Judy J1T
+-	cd man/man3; ln -s Judy J1S
+-	cd man/man3; ln -s Judy J1U
+-	cd man/man3; ln -s Judy J1F
+-	cd man/man3; ln -s Judy J1N
+-	cd man/man3; ln -s Judy J1L
+-	cd man/man3; ln -s Judy J1P
+-	cd man/man3; ln -s Judy J1FE
+-	cd man/man3; ln -s Judy J1NE
+-	cd man/man3; ln -s Judy J1LE
+-	cd man/man3; ln -s Judy J1PE
+-	cd man/man3; ln -s Judy J1C
+-	cd man/man3; ln -s Judy J1BC
+-	cd man/man3; ln -s Judy J1FA
+-	cd man/man3; ln -s Judy J1MU
++
++dep_on_Judy1_funcs = Judy1Test Judy1Set Judy1Unset Judy1First Judy1Next Judy1Last Judy1Prev Judy1FirstEmpty Judy1NextEmpty Judy1LastEmpty Judy1PrevEmpty Judy1Count Judy1ByCount Judy1FreeArray Judy1MemUsed
++
++$(patsubst %,man/man3/%,$(dep_on_Judy1_funcs)): man/man3/Judy1_funcs
+ 
+ man/man3/Judy1_funcs:
+ 	../tool/jhton ext/Judy1_funcs_3.htm | grep -v '^[   ]*$$' | sed -e 's/\.C//' > man/man3/Judy1_funcs
+-	cd man/man3; ln -s Judy1_funcs Judy1Test 
+-	cd man/man3; ln -s Judy1_funcs Judy1Set 
+-	cd man/man3; ln -s Judy1_funcs Judy1Unset 
+-	cd man/man3; ln -s Judy1_funcs Judy1First 
+-	cd man/man3; ln -s Judy1_funcs Judy1Next
+-	cd man/man3; ln -s Judy1_funcs Judy1Last
+-	cd man/man3; ln -s Judy1_funcs Judy1Prev
+-	cd man/man3; ln -s Judy1_funcs Judy1FirstEmpty
+-	cd man/man3; ln -s Judy1_funcs Judy1NextEmpty
+-	cd man/man3; ln -s Judy1_funcs Judy1LastEmpty
+-	cd man/man3; ln -s Judy1_funcs Judy1PrevEmpty
+-	cd man/man3; ln -s Judy1_funcs Judy1Count
+-	cd man/man3; ln -s Judy1_funcs Judy1ByCount
+-	cd man/man3; ln -s Judy1_funcs Judy1FreeArray
+-	cd man/man3; ln -s Judy1_funcs Judy1MemUsed
++	cd man/man3 && \
++	for man in $(dep_on_Judy1_funcs); do \
++		ln -s Judy1_funcs $$man; \
++	done
++
++dep_on_JudyL= JLG JLI JLD JLF JLN JLL JLP JLFE JLNE JLLE JLPE JLC JLBC JLFA JLMU
++
++$(patsubst %,man/man3/%,$(dep_on_JudyL)): man/man3/JudyL
+ 
+ man/man3/JudyL:
+ 	../tool/jhton ext/JudyL_3.htm | grep -v '^[   ]*$$' | sed -e 's/\.C//' > man/man3/JudyL
+-	cd man/man3; ln -s JudyL JLG
+-	cd man/man3; ln -s JudyL JLI
+-	cd man/man3; ln -s JudyL JLD
+-	cd man/man3; ln -s JudyL JLF
+-	cd man/man3; ln -s JudyL JLN
+-	cd man/man3; ln -s JudyL JLL
+-	cd man/man3; ln -s JudyL JLP
+-	cd man/man3; ln -s JudyL JLFE
+-	cd man/man3; ln -s JudyL JLNE
+-	cd man/man3; ln -s JudyL JLLE
+-	cd man/man3; ln -s JudyL JLPE
+-	cd man/man3; ln -s JudyL JLC
+-	cd man/man3; ln -s JudyL JLBC
+-	cd man/man3; ln -s JudyL JLFA
+-	cd man/man3; ln -s JudyL JLMU
++	cd man/man3 && \
++	for man in $(dep_on_JudyL); do \
++		ln -s JudyL $$man; \
++	done
++
++dep_on_JudyL_funcs = JudyLGet JudyLIns JudyLDel JudyLFirst JudyLNext JudyLLast JudyLPrev JudyLFirstEmpty JudyLNextEmpty JudyLLastEmpty JudyLPrevEmpty JudyLCount JudyLByCount JudyLFreeArray JudyLMemUsed
++
++$(patsubst %,man/man3/%,$(dep_on_JudyL_funcs)): man/man3/JudyL_funcs
+ 
+ man/man3/JudyL_funcs:
+ 	../tool/jhton ext/JudyL_funcs_3.htm | grep -v '^[   ]*$$' | sed -e 's/\.C//' > man/man3/JudyL_funcs
+-	cd man/man3; ln -s JudyL_funcs JudyLGet
+-	cd man/man3; ln -s JudyL_funcs JudyLIns
+-	cd man/man3; ln -s JudyL_funcs JudyLDel
+-	cd man/man3; ln -s JudyL_funcs JudyLFirst
+-	cd man/man3; ln -s JudyL_funcs JudyLNext
+-	cd man/man3; ln -s JudyL_funcs JudyLLast
+-	cd man/man3; ln -s JudyL_funcs JudyLPrev
+-	cd man/man3; ln -s JudyL_funcs JudyLFirstEmpty
+-	cd man/man3; ln -s JudyL_funcs JudyLNextEmpty
+-	cd man/man3; ln -s JudyL_funcs JudyLLastEmpty
+-	cd man/man3; ln -s JudyL_funcs JudyLPrevEmpty
+-	cd man/man3; ln -s JudyL_funcs JudyLCount
+-	cd man/man3; ln -s JudyL_funcs JudyLByCount
+-	cd man/man3; ln -s JudyL_funcs JudyLFreeArray
+-	cd man/man3; ln -s JudyL_funcs JudyLMemUsed
++	cd man/man3 && \
++	for man in $(dep_on_JudyL_funcs); do \
++		ln -s JudyL_funcs $$man; \
++	done
++
++dep_on_JudySL = JSLG JSLI JSLD JSLF JSLN JSLL JSLP JSLFA
++
++$(patsubst %,man/man3/%,$(dep_on_JudySL)): man/man3/JudySL
+ 
+ man/man3/JudySL:
+ 	../tool/jhton ext/JudySL_3.htm | grep -v '^[   ]*$$' | sed -e 's/\.C//' > man/man3/JudySL
+-	cd man/man3; ln -s JudySL JSLG
+-	cd man/man3; ln -s JudySL JSLI
+-	cd man/man3; ln -s JudySL JSLD
+-	cd man/man3; ln -s JudySL JSLF
+-	cd man/man3; ln -s JudySL JSLN
+-	cd man/man3; ln -s JudySL JSLL
+-	cd man/man3; ln -s JudySL JSLP
+-	cd man/man3; ln -s JudySL JSLFA
++	cd man/man3 && \
++	for man in $(dep_on_JudySL); do \
++		ln -s JudySL $$man; \
++	done
++
++dep_on_JudySL_funcs = JudySLGet JudySLIns JudySLDel JudySLFirst JudySLNext JudySLLast JudySLPrev JudySLFreeArray
++
++$(patsubst %,man/man3/%,$(dep_on_JudySL_funcs)): man/man3/JudySL_funcs
+ 
+ man/man3/JudySL_funcs:
+ 	../tool/jhton ext/JudySL_funcs_3.htm | grep -v '^[   ]*$$' | sed -e 's/\.C//' > man/man3/JudySL_funcs
+-	cd man/man3; ln -s JudySL_funcs JudySLGet
+-	cd man/man3; ln -s JudySL_funcs JudySLIns
+-	cd man/man3; ln -s JudySL_funcs JudySLDel
+-	cd man/man3; ln -s JudySL_funcs JudySLFirst
+-	cd man/man3; ln -s JudySL_funcs JudySLNext
+-	cd man/man3; ln -s JudySL_funcs JudySLLast
+-	cd man/man3; ln -s JudySL_funcs JudySLPrev
+-	cd man/man3; ln -s JudySL_funcs JudySLFreeArray
++	cd man/man3 && \
++	for man in $(dep_on_JudySL_funcs); do \
++		ln -s JudySL_funcs $$man; \
++	done
++
++dep_on_JudyHS = JHSG JHSI JHSD JHSFA
++
++$(patsubst %,man/man3/%,$(dep_on_JudyHS)): man/man3/JudyHS
+ 
+ man/man3/JudyHS:
+ 	../tool/jhton ext/JudyHS_3.htm | grep -v '^[   ]*$$' | sed -e 's/\.C//' > man/man3/JudyHS
+-	cd man/man3; ln -s JudyHS JHSG 
+-	cd man/man3; ln -s JudyHS JHSI
+-	cd man/man3; ln -s JudyHS JHSD
+-	cd man/man3; ln -s JudyHS JHSFA
++	cd man/man3 && \
++	for man in $(dep_on_JudyHS); do \
++		ln -s JudyHS $$man; \
++	done
++
++dep_on_JudyHS_funcs = JudyHSGet JudyHSIns JudyHSDel JudyHSFreeArray
++
++$(patsubst %,man/man3/%,$(dep_on_JudyHS_funcs)): man/man3/JudyHS_funcs
+ 
+ man/man3/JudyHS_funcs:
+ 	../tool/jhton ext/JudyHS_funcs_3.htm | grep -v '^[   ]*$$' | sed -e 's/\.C//' > man/man3/JudyHS_funcs
+-	cd man/man3; ln -s JudyHS_funcs JudyHSGet
+-	cd man/man3; ln -s JudyHS_funcs JudyHSIns
+-	cd man/man3; ln -s JudyHS_funcs JudyHSDel
+-	cd man/man3; ln -s JudyHS_funcs JudyHSFreeArray
++	cd man/man3 && \
++	for man in $(dep_on_JudyHS_funcs); do \
++		ln -s JudyHS_funcs $$man; \
++	done
+
diff --git a/dev-libs/judy/judy-1.0.1.ebuild b/dev-libs/judy/judy-1.0.1.ebuild
deleted file mode 100644
index 9c16c2a2eefa..000000000000
--- a/dev-libs/judy/judy-1.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/judy/judy-1.0.1.ebuild,v 1.3 2006/09/04 18:22:08 gustavoz Exp $
-
-inherit eutils
-
-MY_P=Judy-${PV}
-DESCRIPTION="A C library that implements a dynamic array"
-HOMEPAGE="http://judy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/judy/${MY_P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ~amd64 ppc sparc"
-IUSE=""
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	if ( use amd64 || use ia64 || use ppc64 ); then
-		econf --enable-64-bit
-	else
-		econf --enable-32-bit
-	fi
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/dev-libs/judy/judy-1.0.4.ebuild b/dev-libs/judy/judy-1.0.4.ebuild
index 8f71e26f0a1c..dc4dd58aabbf 100644
--- a/dev-libs/judy/judy-1.0.4.ebuild
+++ b/dev-libs/judy/judy-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/judy/judy-1.0.4.ebuild,v 1.1 2008/03/24 17:58:06 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/judy/judy-1.0.4.ebuild,v 1.2 2008/11/03 15:33:43 pva Exp $
 
 inherit eutils libtool
 
@@ -9,6 +9,7 @@ MY_P=Judy-${PV}
 DESCRIPTION="A C library that implements a dynamic array"
 HOMEPAGE="http://judy.sourceforge.net/"
 SRC_URI="mirror://sourceforge/judy/${MY_P}.tar.gz"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
@@ -16,17 +17,12 @@ IUSE=""
 
 S=${WORKDIR}/${MY_P}
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-parallel-make.patch"
+	eautomake
 	elibtoolize
-	local myconf
-	if use amd64 || use ia64 || use ppc64 ; then
-		myconf="--enable-64-bit"
-	else
-		myconf="--enable-32-bit"
-	fi
-
-	econf ${myconf} || die "econf failed"
-	emake -j1 || die "emake failed"
 }
 
 src_install() {
diff --git a/dev-libs/judy/metadata.xml b/dev-libs/judy/metadata.xml
index 9f3fdee2246b..fe8a273e1e15 100644
--- a/dev-libs/judy/metadata.xml
+++ b/dev-libs/judy/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>pva@gentoo.org</email>
+		<name>Peter Volkov</name>
 	</maintainer>
 </pkgmetadata>