| 1 |
caleb 09/03/21 12:23:59 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: db-4.6.21_p4.ebuild db-4.7.25_p3.ebuild |
| 5 |
Log: |
| 6 |
Bumping db 4.6 and 4.7 per 259039 |
| 7 |
(Portage version: 2.1.6.7/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.277 sys-libs/db/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/db/ChangeLog?rev=1.277&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/db/ChangeLog?rev=1.277&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/db/ChangeLog?r1=1.276&r2=1.277 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v |
| 19 |
retrieving revision 1.276 |
| 20 |
retrieving revision 1.277 |
| 21 |
diff -u -r1.276 -r1.277 |
| 22 |
--- ChangeLog 14 Mar 2009 12:54:49 -0000 1.276 |
| 23 |
+++ ChangeLog 21 Mar 2009 12:23:59 -0000 1.277 |
| 24 |
@@ -1,6 +1,13 @@ |
| 25 |
# ChangeLog for sys-libs/db |
| 26 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.276 2009/03/14 12:54:49 vapier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.277 2009/03/21 12:23:59 caleb Exp $ |
| 29 |
+ |
| 30 |
+*db-4.7.25_p3 (21 Mar 2009) |
| 31 |
+*db-4.6.21_p4 (21 Mar 2009) |
| 32 |
+ |
| 33 |
+ 21 Mar 2009; Caleb Tennis <caleb@g.o> +db-4.6.21_p4.ebuild, |
| 34 |
+ +db-4.7.25_p3.ebuild: |
| 35 |
+ Bumping db 4.6 and 4.7 per 259039 |
| 36 |
|
| 37 |
14 Mar 2009; Mike Frysinger <vapier@g.o> db-4.2.52_p4-r2.ebuild, |
| 38 |
db-4.2.52_p5.ebuild, db-4.2.52_p5-r1.ebuild, db-4.3.29-r2.ebuild, |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 sys-libs/db/db-4.6.21_p4.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/db/db-4.6.21_p4.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/db/db-4.6.21_p4.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: db-4.6.21_p4.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2009 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.6.21_p4.ebuild,v 1.1 2009/03/21 12:23:59 caleb Exp $ |
| 52 |
|
| 53 |
inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool |
| 54 |
|
| 55 |
#Number of official patches |
| 56 |
#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` |
| 57 |
PATCHNO=${PV/*.*.*_p} |
| 58 |
if [[ ${PATCHNO} == "${PV}" ]] ; then |
| 59 |
MY_PV=${PV} |
| 60 |
MY_P=${P} |
| 61 |
PATCHNO=0 |
| 62 |
else |
| 63 |
MY_PV=${PV/_p${PATCHNO}} |
| 64 |
MY_P=${PN}-${MY_PV} |
| 65 |
fi |
| 66 |
|
| 67 |
S="${WORKDIR}/${MY_P}/build_unix" |
| 68 |
DESCRIPTION="Oracle Berkeley DB" |
| 69 |
HOMEPAGE="http://www.oracle.com/technology/software/products/berkeley-db/index.html" |
| 70 |
SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" |
| 71 |
for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do |
| 72 |
export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" |
| 73 |
done |
| 74 |
|
| 75 |
LICENSE="OracleDB" |
| 76 |
SLOT="4.6" |
| 77 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" |
| 78 |
IUSE="tcl java doc nocxx" |
| 79 |
|
| 80 |
DEPEND="tcl? ( >=dev-lang/tcl-8.4 ) |
| 81 |
java? ( >=virtual/jdk-1.4 ) |
| 82 |
>=sys-devel/binutils-2.16.1" |
| 83 |
RDEPEND="tcl? ( dev-lang/tcl ) |
| 84 |
java? ( >=virtual/jre-1.4 )" |
| 85 |
|
| 86 |
src_unpack() { |
| 87 |
unpack "${MY_P}".tar.gz |
| 88 |
cd "${WORKDIR}"/"${MY_P}" |
| 89 |
for (( i=1 ; i<=${PATCHNO} ; i++ )) |
| 90 |
do |
| 91 |
epatch "${DISTDIR}"/patch."${MY_PV}"."${i}" |
| 92 |
done |
| 93 |
epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch |
| 94 |
|
| 95 |
# use the includes from the prefix |
| 96 |
epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch |
| 97 |
epatch "${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch |
| 98 |
|
| 99 |
# Include the SLOT for Java JAR files |
| 100 |
# This supersedes the unused jarlocation patches. |
| 101 |
sed -r -i \ |
| 102 |
-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ |
| 103 |
"${S}"/../dist/Makefile.in |
| 104 |
|
| 105 |
cd "${S}"/../dist |
| 106 |
rm -f aclocal/libtool.m4 |
| 107 |
sed -i \ |
| 108 |
-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ |
| 109 |
configure.ac |
| 110 |
sed -i \ |
| 111 |
-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ |
| 112 |
aclocal/programs.m4 |
| 113 |
AT_M4DIR="aclocal aclocal_java" eautoreconf |
| 114 |
# Upstream sucks - they do autoconf and THEN replace the version variables. |
| 115 |
. ./RELEASE |
| 116 |
sed -i \ |
| 117 |
-e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ |
| 118 |
-e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ |
| 119 |
-e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ |
| 120 |
-e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ |
| 121 |
-e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ |
| 122 |
-e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure |
| 123 |
} |
| 124 |
|
| 125 |
src_compile() { |
| 126 |
# compilation with -O0 fails on amd64, see bug #171231 |
| 127 |
if use amd64; then |
| 128 |
replace-flags -O0 -O2 |
| 129 |
is-flagq -O[s123] || append-flags -O2 |
| 130 |
fi |
| 131 |
|
| 132 |
local myconf="" |
| 133 |
|
| 134 |
use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly" |
| 135 |
|
| 136 |
myconf="${myconf} $(use_enable !nocxx cxx)" |
| 137 |
|
| 138 |
use tcl \ |
| 139 |
&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \ |
| 140 |
|| myconf="${myconf} --disable-tcl" |
| 141 |
|
| 142 |
myconf="${myconf} $(use_enable java)" |
| 143 |
if use java; then |
| 144 |
myconf="${myconf} --with-java-prefix=${JAVA_HOME}" |
| 145 |
# Can't get this working any other way, since it returns spaces, and |
| 146 |
# bash doesn't seem to want to pass correctly in any way i try |
| 147 |
local javaconf="-with-javac-flags=$(java-pkg_javac-args)" |
| 148 |
fi |
| 149 |
|
| 150 |
[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}" |
| 151 |
|
| 152 |
# the entire testsuite needs the TCL functionality |
| 153 |
if use tcl && has test $FEATURES ; then |
| 154 |
myconf="${myconf} --enable-test" |
| 155 |
else |
| 156 |
myconf="${myconf} --disable-test" |
| 157 |
fi |
| 158 |
|
| 159 |
# Add linker versions to the symbols. Easier to do, and safer than header file |
| 160 |
# mumbo jumbo. |
| 161 |
if use userland_GNU; then |
| 162 |
append-ldflags -Wl,--default-symver |
| 163 |
fi |
| 164 |
|
| 165 |
cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \ |
| 166 |
--prefix=/usr \ |
| 167 |
--mandir=/usr/share/man \ |
| 168 |
--infodir=/usr/share/info \ |
| 169 |
--datadir=/usr/share \ |
| 170 |
--sysconfdir=/etc \ |
| 171 |
--localstatedir=/var/lib \ |
| 172 |
--libdir=/usr/"$(get_libdir)" \ |
| 173 |
--enable-compat185 \ |
| 174 |
--enable-o_direct \ |
| 175 |
--without-uniquename \ |
| 176 |
--enable-rpc \ |
| 177 |
--host="${CHOST}" \ |
| 178 |
${myconf} "${javaconf}" || die "configure failed" |
| 179 |
|
| 180 |
sed -e "s,\(^STRIP *=\).*,\1\"none\"," Makefile > Makefile.cpy \ |
| 181 |
&& mv Makefile.cpy Makefile |
| 182 |
|
| 183 |
emake || die "make failed" |
| 184 |
} |
| 185 |
|
| 186 |
src_install() { |
| 187 |
einstall libdir="${D}/usr/$(get_libdir)" STRIP="none" || die |
| 188 |
|
| 189 |
db_src_install_usrbinslot |
| 190 |
|
| 191 |
db_src_install_headerslot |
| 192 |
|
| 193 |
db_src_install_doc |
| 194 |
|
| 195 |
db_src_install_usrlibcleanup |
| 196 |
|
| 197 |
dodir /usr/sbin |
| 198 |
mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc |
| 199 |
|
| 200 |
if use java; then |
| 201 |
java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so |
| 202 |
java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar |
| 203 |
rm -f "${D}"/usr/"$(get_libdir)"/*.jar |
| 204 |
fi |
| 205 |
} |
| 206 |
|
| 207 |
pkg_postinst() { |
| 208 |
db_fix_so |
| 209 |
} |
| 210 |
|
| 211 |
pkg_postrm() { |
| 212 |
db_fix_so |
| 213 |
} |
| 214 |
|
| 215 |
|
| 216 |
|
| 217 |
1.1 sys-libs/db/db-4.7.25_p3.ebuild |
| 218 |
|
| 219 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/db/db-4.7.25_p3.ebuild?rev=1.1&view=markup |
| 220 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/db/db-4.7.25_p3.ebuild?rev=1.1&content-type=text/plain |
| 221 |
|
| 222 |
Index: db-4.7.25_p3.ebuild |
| 223 |
=================================================================== |
| 224 |
# Copyright 1999-2009 Gentoo Foundation |
| 225 |
# Distributed under the terms of the GNU General Public License v2 |
| 226 |
# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.7.25_p3.ebuild,v 1.1 2009/03/21 12:23:59 caleb Exp $ |
| 227 |
|
| 228 |
inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool |
| 229 |
|
| 230 |
#Number of official patches |
| 231 |
#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` |
| 232 |
PATCHNO=${PV/*.*.*_p} |
| 233 |
if [[ ${PATCHNO} == "${PV}" ]] ; then |
| 234 |
MY_PV=${PV} |
| 235 |
MY_P=${P} |
| 236 |
PATCHNO=0 |
| 237 |
else |
| 238 |
MY_PV=${PV/_p${PATCHNO}} |
| 239 |
MY_P=${PN}-${MY_PV} |
| 240 |
fi |
| 241 |
|
| 242 |
S="${WORKDIR}/${MY_P}/build_unix" |
| 243 |
DESCRIPTION="Oracle Berkeley DB" |
| 244 |
HOMEPAGE="http://www.oracle.com/technology/software/products/berkeley-db/index.html" |
| 245 |
SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" |
| 246 |
for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do |
| 247 |
export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" |
| 248 |
done |
| 249 |
|
| 250 |
LICENSE="OracleDB" |
| 251 |
SLOT="4.7" |
| 252 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" |
| 253 |
IUSE="doc java nocxx tcl test" |
| 254 |
|
| 255 |
# the entire testsuite needs the TCL functionality |
| 256 |
DEPEND="tcl? ( >=dev-lang/tcl-8.4 ) |
| 257 |
test? ( >=dev-lang/tcl-8.4 ) |
| 258 |
java? ( >=virtual/jdk-1.5 ) |
| 259 |
>=sys-devel/binutils-2.16.1" |
| 260 |
RDEPEND="tcl? ( dev-lang/tcl ) |
| 261 |
java? ( >=virtual/jre-1.5 )" |
| 262 |
|
| 263 |
src_unpack() { |
| 264 |
unpack "${MY_P}".tar.gz |
| 265 |
cd "${WORKDIR}"/"${MY_P}" |
| 266 |
for (( i=1 ; i<=${PATCHNO} ; i++ )) |
| 267 |
do |
| 268 |
epatch "${DISTDIR}"/patch."${MY_PV}"."${i}" |
| 269 |
done |
| 270 |
epatch "${FILESDIR}"/"${PN}"-4.6-libtool.patch |
| 271 |
|
| 272 |
# use the includes from the prefix |
| 273 |
epatch "${FILESDIR}"/"${PN}"-4.6-jni-check-prefix-first.patch |
| 274 |
epatch "${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch |
| 275 |
|
| 276 |
# Include the SLOT for Java JAR files |
| 277 |
# This supersedes the unused jarlocation patches. |
| 278 |
sed -r -i \ |
| 279 |
-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ |
| 280 |
"${S}"/../dist/Makefile.in |
| 281 |
|
| 282 |
cd "${S}"/../dist |
| 283 |
rm -f aclocal/libtool.m4 |
| 284 |
sed -i \ |
| 285 |
-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ |
| 286 |
configure.ac |
| 287 |
sed -i \ |
| 288 |
-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ |
| 289 |
aclocal/programs.m4 |
| 290 |
AT_M4DIR="aclocal aclocal_java" eautoreconf |
| 291 |
# Upstream sucks - they do autoconf and THEN replace the version variables. |
| 292 |
. ./RELEASE |
| 293 |
sed -i \ |
| 294 |
-e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ |
| 295 |
-e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ |
| 296 |
-e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ |
| 297 |
-e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ |
| 298 |
-e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ |
| 299 |
-e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure |
| 300 |
} |
| 301 |
|
| 302 |
src_compile() { |
| 303 |
# compilation with -O0 fails on amd64, see bug #171231 |
| 304 |
if use amd64; then |
| 305 |
replace-flags -O0 -O2 |
| 306 |
is-flagq -O[s123] || append-flags -O2 |
| 307 |
fi |
| 308 |
|
| 309 |
# use `set` here since the java opts will contain whitespace |
| 310 |
set -- |
| 311 |
if use java ; then |
| 312 |
set -- "$@" \ |
| 313 |
--with-java-prefix="${JAVA_HOME}" \ |
| 314 |
--with-javac-flags="$(java-pkg_javac-args)" |
| 315 |
fi |
| 316 |
|
| 317 |
# Add linker versions to the symbols. Easier to do, and safer than header file |
| 318 |
# mumbo jumbo. |
| 319 |
if use userland_GNU ; then |
| 320 |
append-ldflags -Wl,--default-symver |
| 321 |
fi |
| 322 |
|
| 323 |
cd "${S}" |
| 324 |
ECONF_SOURCE="${S}"/../dist \ |
| 325 |
STRIP="true" \ |
| 326 |
econf \ |
| 327 |
--enable-compat185 \ |
| 328 |
--enable-o_direct \ |
| 329 |
--without-uniquename \ |
| 330 |
--enable-rpc \ |
| 331 |
$(use amd64 && echo --with-mutex=x86/gcc-assembly) \ |
| 332 |
$(use_enable !nocxx cxx) \ |
| 333 |
$(use_enable java) \ |
| 334 |
$(use_enable tcl) \ |
| 335 |
$(use tcl && echo --with-tcl=/usr/$(get_libdir)) \ |
| 336 |
$(use_enable test) \ |
| 337 |
"$@" |
| 338 |
|
| 339 |
emake || die "make failed" |
| 340 |
} |
| 341 |
|
| 342 |
src_install() { |
| 343 |
emake install DESTDIR="${D}" || die |
| 344 |
|
| 345 |
db_src_install_usrbinslot |
| 346 |
|
| 347 |
db_src_install_headerslot |
| 348 |
|
| 349 |
db_src_install_doc |
| 350 |
|
| 351 |
db_src_install_usrlibcleanup |
| 352 |
|
| 353 |
dodir /usr/sbin |
| 354 |
mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc |
| 355 |
|
| 356 |
if use java; then |
| 357 |
java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so |
| 358 |
java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar |
| 359 |
rm -f "${D}"/usr/"$(get_libdir)"/*.jar |
| 360 |
fi |
| 361 |
} |
| 362 |
|
| 363 |
pkg_postinst() { |
| 364 |
db_fix_so |
| 365 |
} |
| 366 |
|
| 367 |
pkg_postrm() { |
| 368 |
db_fix_so |
| 369 |
} |
Archives