From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- .../apr-util/files/apr-util-1.3.12-bdb-5.2.patch | 139 +++++++++++++++++++++ .../apr-util/files/apr-util-1.5.3-berkdb6.patch | 69 ++++++++++ .../apr-util/files/apr-util-1.5.3-sysroot.patch | 36 ++++++ 3 files changed, 244 insertions(+) create mode 100644 dev-libs/apr-util/files/apr-util-1.3.12-bdb-5.2.patch create mode 100644 dev-libs/apr-util/files/apr-util-1.5.3-berkdb6.patch create mode 100644 dev-libs/apr-util/files/apr-util-1.5.3-sysroot.patch (limited to 'dev-libs/apr-util/files') diff --git a/dev-libs/apr-util/files/apr-util-1.3.12-bdb-5.2.patch b/dev-libs/apr-util/files/apr-util-1.3.12-bdb-5.2.patch new file mode 100644 index 000000000000..5687a8e730fc --- /dev/null +++ b/dev-libs/apr-util/files/apr-util-1.3.12-bdb-5.2.patch @@ -0,0 +1,139 @@ +--- build/dbm.m4 ++++ build/dbm.m4 +@@ -579,6 +579,25 @@ + apu_db_version=5 + fi + ]) ++dnl ++dnl APU_CHECK_DB52: is DB5.2 present? ++dnl ++dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version ++dnl ++AC_DEFUN([APU_CHECK_DB52], [ ++ places=$1 ++ if test -z "$places"; then ++ places="std /usr/local/BerkeleyDB.5.2 /boot/home/config" ++ fi ++ APU_CHECK_BERKELEY_DB("5", "2", "-1", ++ "$places", ++ "db52/db.h db5/db.h db.h", ++ "db-5.2 db5-5.2 db52 db5 db" ++ ) ++ if test "$apu_have_db" = "1"; then ++ apu_db_version=5 ++ fi ++]) + + AC_DEFUN([APU_CHECK_DB], [ + requested=$1 +@@ -681,6 +700,12 @@ + AC_MSG_ERROR(Berkeley db5 not found) + fi + ;; ++ db52) ++ APU_CHECK_DB52("$check_places") ++ if test "$apu_db_version" != "5"; then ++ AC_MSG_ERROR(Berkeley db5 not found) ++ fi ++ ;; + default) + APU_CHECK_DB_ALL("$check_places") + ;; +@@ -688,40 +713,43 @@ + ]) + + dnl +-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.1 to 1. ++dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.2 to 1. + dnl + AC_DEFUN([APU_CHECK_DB_ALL], [ + all_places=$1 + +- APU_CHECK_DB51("$all_places") ++ APU_CHECK_DB52("$all_places") + if test "$apu_db_version" != "5"; then +- APU_CHECK_DB50("$all_places") ++ APU_CHECK_DB51("$all_places") + if test "$apu_db_version" != "5"; then +- APU_CHECK_DB48("$all_places") +- if test "$apu_db_version" != "4"; then +- APU_CHECK_DB47("$all_places") ++ APU_CHECK_DB50("$all_places") ++ if test "$apu_db_version" != "5"; then ++ APU_CHECK_DB48("$all_places") + if test "$apu_db_version" != "4"; then +- APU_CHECK_DB46("$all_places") ++ APU_CHECK_DB47("$all_places") + if test "$apu_db_version" != "4"; then +- APU_CHECK_DB45("$all_places") ++ APU_CHECK_DB46("$all_places") + if test "$apu_db_version" != "4"; then +- APU_CHECK_DB44("$all_places") ++ APU_CHECK_DB45("$all_places") + if test "$apu_db_version" != "4"; then +- APU_CHECK_DB43("$all_places") ++ APU_CHECK_DB44("$all_places") + if test "$apu_db_version" != "4"; then +- APU_CHECK_DB42("$all_places") ++ APU_CHECK_DB43("$all_places") + if test "$apu_db_version" != "4"; then +- APU_CHECK_DB41("$all_places") ++ APU_CHECK_DB42("$all_places") + if test "$apu_db_version" != "4"; then +- APU_CHECK_DB4("$all_places") ++ APU_CHECK_DB41("$all_places") + if test "$apu_db_version" != "4"; then +- APU_CHECK_DB3("$all_places") +- if test "$apu_db_version" != "3"; then +- APU_CHECK_DB2("$all_places") +- if test "$apu_db_version" != "2"; then +- APU_CHECK_DB1("$all_places") +- if test "$apu_db_version" != "1"; then +- APU_CHECK_DB185("$all_places") ++ APU_CHECK_DB4("$all_places") ++ if test "$apu_db_version" != "4"; then ++ APU_CHECK_DB3("$all_places") ++ if test "$apu_db_version" != "3"; then ++ APU_CHECK_DB2("$all_places") ++ if test "$apu_db_version" != "2"; then ++ APU_CHECK_DB1("$all_places") ++ if test "$apu_db_version" != "1"; then ++ APU_CHECK_DB185("$all_places") ++ fi + fi + fi + fi +@@ -763,11 +791,11 @@ + apu_db_version=0 + + AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use. +- DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50,db51}])], ++ DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50,db51,db52}])], + [ + if test "$withval" = "yes"; then + AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use. +- One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51]) ++ One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51, db52]) + fi + requested="$withval" + ], [ +@@ -978,6 +1006,10 @@ + apu_use_db=1 + apu_default_dbm=db5 + ;; ++ db52) ++ apu_use_db=1 ++ apu_default_dbm=db5 ++ ;; + default) + dnl ### use more sophisticated DBMs for the default? + apu_default_dbm="sdbm (default)" +@@ -985,7 +1017,7 @@ + ;; + *) + AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type. +- Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51]) ++ Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51, db52]) + ;; + esac + diff --git a/dev-libs/apr-util/files/apr-util-1.5.3-berkdb6.patch b/dev-libs/apr-util/files/apr-util-1.5.3-berkdb6.patch new file mode 100644 index 000000000000..a3f4a3c9b19d --- /dev/null +++ b/dev-libs/apr-util/files/apr-util-1.5.3-berkdb6.patch @@ -0,0 +1,69 @@ +http://svn.apache.org/viewvc/apr/apr/trunk/build/dbm.m4?r1=1495889&r2=1544846&diff_format=h + +--- apr/apr/trunk/build/dbm.m4 2013/06/23 20:27:54 1495889 ++++ apr/apr/trunk/build/dbm.m4 2013/11/23 17:57:39 1544846 +@@ -112,7 +112,7 @@ + changequote([,]) + unset $cache_id + AC_CHECK_HEADER([$bdb_header], [ +- if test "$1" = "3" -o "$1" = "4" -o "$1" = "5"; then ++ if test "$1" = "3" -o "$1" = "4" -o "$1" = "5" -o "$1" = "6"; then + # We generate a separate cache variable for each prefix and libname + # we search under. That way, we avoid caching information that + # changes if the user runs `configure' with a different set of +@@ -455,13 +455,13 @@ + ]) + + dnl +-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.X to 1. ++dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 6.X to 1. + dnl + AC_DEFUN([APU_CHECK_DB_ALL], [ + all_places=$1 + +- # Start version search at version 5.9 +- db_version=59 ++ # Start version search at version 6.9 ++ db_version=69 + while [[ $db_version -ge 40 ]] + do + db_major=`echo $db_version | sed -e 's/.$//'` +@@ -511,19 +511,34 @@ + apu_db_version=0 + + # Maximum supported version announced in help string. +- # Although we search for all versions up to 5.9, ++ # Although we search for all versions up to 6.9, + # we should only include existing versions in our + # help string. +- db_max_version=53 +- db_min_version=41 + dbm_list="sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4" ++ db_max_version=48 ++ db_min_version=41 ++ db_version="$db_min_version" ++ while [[ $db_version -le $db_max_version ]] ++ do ++ dbm_list="$dbm_list, db$db_version" ++ db_version=`expr $db_version + 1` ++ done ++ db_max_version=53 ++ db_min_version=50 ++ db_version="$db_min_version" ++ while [[ $db_version -le $db_max_version ]] ++ do ++ dbm_list="$dbm_list, db$db_version" ++ db_version=`expr $db_version + 1` ++ done ++ db_max_version=60 ++ db_min_version=60 + db_version="$db_min_version" + while [[ $db_version -le $db_max_version ]] + do + dbm_list="$dbm_list, db$db_version" + db_version=`expr $db_version + 1` + done +- dbm_list="$dbm_list, db60" + + AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use. + DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X,db6X} for some X=0,...,9])], diff --git a/dev-libs/apr-util/files/apr-util-1.5.3-sysroot.patch b/dev-libs/apr-util/files/apr-util-1.5.3-sysroot.patch new file mode 100644 index 000000000000..ce07b1470525 --- /dev/null +++ b/dev-libs/apr-util/files/apr-util-1.5.3-sysroot.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/385775 + +utilize $SYSROOT to find the right includedir tree + +drop the -L/-R paths since we know our libdir is the standard path which +the compiler already knows how to locate + +--- a/apu-config.in ++++ b/apu-config.in +@@ -25,7 +25,7 @@ prefix="@prefix@" + exec_prefix="@exec_prefix@" + bindir="@bindir@" + libdir="@libdir@" +-includedir="@includedir@" ++includedir="${SYSROOT}@includedir@" + + LIBS="@APRUTIL_EXPORT_LIBS@" + INCLUDES="@APRUTIL_INCLUDES@" +@@ -166,7 +166,7 @@ while test $# -gt 0; do + --link-ld) + if test "$location" = "installed"; then + ### avoid using -L if libdir is a "standard" location like /usr/lib +- flags="$flags -L$libdir -l$APRUTIL_LIBNAME" ++ flags="$flags -l$APRUTIL_LIBNAME" + else + flags="$flags -L$APU_BUILD_DIR -l$APRUTIL_LIBNAME" + fi +@@ -182,7 +182,7 @@ while test $# -gt 0; do + ### avoid using -L if libdir is a "standard" location like /usr/lib + # Since the user is specifying they are linking with libtool, we + # *know* that -R will be recognized by libtool. +- flags="$flags -L$libdir -R$libdir -l$APRUTIL_LIBNAME" ++ flags="$flags -l$APRUTIL_LIBNAME" + else + flags="$flags $LA_FILE" + fi -- cgit v1.2.3-65-gdbad