refix bug #113352
authorFrancesco Riosa <vivo@gentoo.org>
Thu, 24 Nov 2005 14:03:52 +0000 (14:03 +0000)
committerFrancesco Riosa <vivo@gentoo.org>
Thu, 24 Nov 2005 14:03:52 +0000 (14:03 +0000)
Package-Manager: portage-2.0.53_rc6

dev-db/mysql/ChangeLog
dev-db/mysql/Manifest
dev-db/mysql/files/digest-mysql-5.0.16-r3 [moved from dev-db/mysql/files/digest-mysql-5.0.16-r2 with 100% similarity]
dev-db/mysql/files/mysql-4.0.24-r2.rc6
dev-db/mysql/files/mysql-slot.rc6
dev-db/mysql/mysql-4.1.15-r30.ebuild
dev-db/mysql/mysql-4.1.15.ebuild
dev-db/mysql/mysql-5.0.16-r3.ebuild [moved from dev-db/mysql/mysql-5.0.16-r2.ebuild with 92% similarity]
dev-db/mysql/mysql-5.0.16-r30.ebuild

index f3c5d34d6ce75de4ccfc6e16174e83b0eda47018..1f6980350fbba43c70c60b0fe1fa6ed8708a6cc6 100644 (file)
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.267 2005/11/24 00:55:05 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.268 2005/11/24 14:03:51 vivo Exp $
+
+*mysql-5.0.16-r3 (24 Nov 2005)
+
+  24 Nov 2005; Francesco Riosa <vivo@gentoo.org> files/mysql-4.0.24-r2.rc6,
+  files/mysql-slot.rc6, mysql-4.1.15.ebuild, mysql-4.1.15-r30.ebuild,
+  -mysql-5.0.16-r2.ebuild, +mysql-5.0.16-r3.ebuild, mysql-5.0.16-r30.ebuild:
+  refix Bug #113352 linkage back in src_config, this has still to be worked on
+  removed annoying dots in rc files
 
   24 Nov 2005; Herbie Hopkins <herbs@gentoo.org> mysql-5.0.16-r2.ebuild,
   mysql-5.0.16-r30.ebuild:
index a88bc6cd6225c912e97cc374087dc1d0cc3fc843..a85df3f64624f2c6acc39dd31bafdbbde94a0eb5 100644 (file)
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 75dc5ca1dea66127370bd5227416ad03 ChangeLog 50844
+MD5 62e989decff72650a1659a9cbffcb9bc ChangeLog 51214
 MD5 c6fcd70c34bed04e59808ec71c5bedfb files/digest-mysql-3.23.58-r1 140
 MD5 0feb3b501c47708ea13707c8e4cdde9c files/digest-mysql-4.0.25-r2 139
 MD5 201c8b31cd9eb58eec712e37d6f0c328 files/digest-mysql-4.0.26 139
@@ -9,7 +6,7 @@ MD5 4e6e76e3945e29b6795ce6d1a66bc98f files/digest-mysql-4.1.14 139
 MD5 081bfa8975526ff1098cc4e067cf7545 files/digest-mysql-4.1.15 139
 MD5 081bfa8975526ff1098cc4e067cf7545 files/digest-mysql-4.1.15-r30 139
 MD5 b9b44f65c775f650064022427ae52425 files/digest-mysql-5.0.15 139
-MD5 aa38cbef56ecdf34fd61c71bac1120e2 files/digest-mysql-5.0.16-r2 139
+MD5 aa38cbef56ecdf34fd61c71bac1120e2 files/digest-mysql-5.0.16-r3 139
 MD5 aa38cbef56ecdf34fd61c71bac1120e2 files/digest-mysql-5.0.16-r30 139
 MD5 d200345efa421d012cf858134d2c8884 files/logrotate.mysql 440
 MD5 f1fc8bfe540d6f1268b53b7cad275080 files/my.cnf 1231
@@ -18,24 +15,17 @@ MD5 9946a8f7163970ec4f6a713c97eadbe0 files/my.cnf-4.0.24-r1 4271
 MD5 277705080f05b5b98b815487e080e562 files/my.cnf-4.1 4068
 MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187
 MD5 d0fbdf4e41f2b52210eef6cb3a53e128 files/mysql-4.0.24-r1.rc6 1662
-MD5 08f1246e8107e4140378d429ff9773af files/mysql-4.0.24-r2.rc6 2123
+MD5 356c1b4211a0b3d229bcb09c7c8742a7 files/mysql-4.0.24-r2.rc6 2151
 MD5 c8a9f17eb53cb46bd7ec6b3105cd8d23 files/mysql-slot.conf.d 3218
-MD5 b5c3665ec55e5bace4e1ddc64f9d35e8 files/mysql-slot.rc6 8662
+MD5 3f0cf4e6c3cb45ef2e8019cdd2423c28 files/mysql-slot.rc6 8697
 MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886
 MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
 MD5 eb11a08abb447b7a69b192a6f9be3dbf mysql-3.23.58-r1.ebuild 7219
 MD5 310c18100b92ec0786cf630ad0a17f94 mysql-4.0.25-r2.ebuild 14260
 MD5 a46e6cb73958dcc8919743ca5dbaf3c3 mysql-4.0.26.ebuild 14888
 MD5 432e8894444e71bc477ef7a68ce5d819 mysql-4.1.14.ebuild 18859
-MD5 767951c93752fe52f33984b3cfa8220a mysql-4.1.15-r30.ebuild 22453
-MD5 3d68365651cc7d8a0eedccda80ae5bd8 mysql-4.1.15.ebuild 22508
+MD5 0df392f43cbe9492b8bf44f52e584486 mysql-4.1.15-r30.ebuild 23541
+MD5 878a2643e30451f8c7e7623571d905b5 mysql-4.1.15.ebuild 23409
 MD5 ed292dce42e38a400c1f274b65c25296 mysql-5.0.15.ebuild 19008
-MD5 1a25be83666cf467574c116d7630aac1 mysql-5.0.16-r2.ebuild 22067
-MD5 5c77c4645b044477bd47441d001eacb0 mysql-5.0.16-r30.ebuild 22641
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDhQ+S2G5bA0cA/ScRAiCFAKCHBqIPs2CMA6lR1rP9NnNkhBQTZACgzSNd
-a+qhhgBASzNQbRRprjNMhyc=
-=per+
------END PGP SIGNATURE-----
+MD5 4775aa97d0af4785eaf5b773d35a791a mysql-5.0.16-r3.ebuild 22993
+MD5 b84925753349084e28c584a4c91ce2bd mysql-5.0.16-r30.ebuild 23541
index ec221775d6ef71fb62eac3cde264da7000e7001e..305fe4af32f8be0d03c7e9a56a69bfd7fae889f0 100644 (file)
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-4.0.24-r2.rc6,v 1.1 2005/05/17 09:08:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-4.0.24-r2.rc6,v 1.2 2005/11/24 14:03:52 vivo Exp $
 
 depend() {
        use dns net
@@ -56,7 +56,8 @@ start() {
        retstatus=$?
        while ! [[ -S "${socket}" || "${maxtry}" -lt "1" || "${retstatus}" -gt "0" ]] ; do
                maxtry=$(($maxtry-1))
-               echo -n "."
+               # most people don't like it
+               #echo -n "."
                sleep 1
        done
        ! [[ -S "${socket}" ]] && eerror "MySQL NOT started, proceding anyway"
index b46fbbbb2f04b2e1b5909c922a8cfa481f0cacaa..7997b236ca0e09599a6386f551364eeafb93383b 100644 (file)
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-slot.rc6,v 1.4 2005/11/23 10:22:21 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-slot.rc6,v 1.5 2005/11/24 14:03:52 vivo Exp $
 
 # external binaryes used: which, sed, tac
 
@@ -245,7 +245,8 @@ start() {
                        # wait for socket creation
                        while ! [[ -S "${socket}" || "${maxtry}" -lt 1 || "${retstatus}" -ne 0 ]] ; do
                                maxtry=$(($maxtry - 1))
-                               echo -n "."
+                               # mostt people don't like it
+                               # echo -n "."
                                sleep 1
                        done
                        if [[ ! -S "${socket}" ]] ; then
index 2c57460bb8dba03a5ba0160c3804c5e3e63f0aed..a6b4c46d04015f7f480127f8bd38b629e87a1b8a 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.15-r30.ebuild,v 1.3 2005/11/23 19:44:22 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.15-r30.ebuild,v 1.4 2005/11/24 14:03:51 vivo Exp $
 
 # helper function, version (integer) may have section separated by dots
 # for readbility
@@ -11,7 +11,7 @@ stripdots() {
 }
 
 # major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo magic number, all [0..99]
-MYSQL_VERSION_ID=$(stripdots "4.01.26.30")
+MYSQL_VERSION_ID=$(stripdots "4.01.15.30")
 PROTOCOL_VERSION=10
 NDB_VERSION_ID=40115
 #major, minor only in the slot
@@ -179,6 +179,16 @@ mysql_init_vars() {
        export DATADIR
 }
 
+mysql_strip_double_slash() {
+       local path="${1}"
+       local newpath="${path/\/\///}"
+       while [[ ${path} != ${newpath} ]]; do
+               path=${newpath}
+               newpath="${path/\/\///}"
+       done
+       echo "${newpath}"
+}
+
 pkg_setup() {
 
        enewgroup mysql 60 || die "problem adding group mysql"
@@ -218,6 +228,10 @@ src_unpack() {
        sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
        rm -f scripts/mysqlbug
 
+       # Multilib issue with zlib detection
+       sed -i -e "s:zlib_dir/lib:zlib_dir/$(get_libdir):g" \
+               "${S}/config/ac-macros/zlib.m4"
+
        # Make charsets install in the right place
        find . -name 'Makefile.am' \
                -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
@@ -371,7 +385,7 @@ src_compile() {
                        myconf="${myconf} $(use_with cluster ndbcluster)"
                fi
 
-               mysql_version_is_at_least "4.01.11.00" &&  myconf="${myconf} --with-big-tables"
+               mysql_version_is_at_least "4.01.11.00" &&  myconf="${myconf} `use_with big-tables`"
        else
                for i in ${minimal_exclude_list}; do
                        myconf="${myconf} --without-${i}"
@@ -397,8 +411,6 @@ src_compile() {
                &&  myconf="${myconf} --with-blackhole-storage-engine"
        fi
 
-       myconf="${myconf} `use_with big-tables`"
-
        #glibc-2.3.2_pre fix; bug #16496
        append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
 
@@ -468,6 +480,24 @@ src_install() {
        mysql_init_vars
        make install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die
 
+       # create globally visible symlinks
+       # TODO : what abaut ndb ?
+       local mylib mylibfullver mylibtmpver maxdots sonamelist
+       pushd "${D}/${MY_LIBDIR}"
+       for mylib in libmysqlclient_r libmysqlclient; do
+               mylibfullver="$(ls "${mylib}.so"* | sort | tail -n 1)"
+               mylibtmpver="${mylibfullver}"
+               maxdots=0
+               while [[ ${mylibtmpver} != ${mylib} ]] && [[ ${maxdots} -lt 6 ]]; do
+                       (( ++maxdots ))
+                       dosym \
+                               $(mysql_strip_double_slash "${MY_LIBDIR}/${mylibfullver}") \
+                               $(mysql_strip_double_slash "${MY_LIBDIR}/../${mylibtmpver}")
+                       mylibtmpver=${mylibtmpver%.*}
+               done
+       done
+       popd
+
        insinto "${MY_INCLUDEDIR}"
        doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
 
@@ -587,29 +617,34 @@ pkg_postinst() {
 
        mysql_init_vars
 
-       # create globally visible symlinks
-       # TODO : what abaut ndb ?
-       local mylib mylibfullver mylibtmpver maxdots sonamelist prevlink
-       pushd "${ROOT}/${MY_LIBDIR}"
-       for mylib in libmysqlclient_r libmysqlclient; do
-               mylibfullver="$(ls "${mylib}.so"* | sort | tail -n 1)"
-               mylibtmpver="${mylibfullver}"
-               maxdots=0
-               while [[ ${mylibtmpver} != ${mylib} ]] && [[ ${maxdots} -lt 6 ]]; do
-                       (( ++maxdots ))
-                       prevlink=$(readlink -f "../${mylibtmpver}")
-                       if [[ -n "${prevlink}" ]] ; then
-                               if [[ "${mylibtmpver}" != "${mylibfullver}" ]] ; then
-                                       einfo "found previous library, please run"
-                                       einfo "revdep-rebuild --soname=${mylibtmpver}"
-                               fi
-                               rm -f "../${mylibtmpver}"
-                       fi
-                       dosym "${mylibfullver}" "../${mylibtmpver}"
-                       mylibtmpver=${mylibtmpver%.*}
-               done
-       done
-       popd
+       ## TODO : make the check
+       ## TODO : what abaut ndb ?
+       #local mylib mylibfullver mylibtmpver maxdots sonamelist prevlink
+       #pushd "${ROOT}/${MY_LIBDIR}"
+       #for mylib in libmysqlclient_r libmysqlclient; do
+       #       mylibfullver="$(ls "${mylib}.so"* | sort | tail -n 1)"
+       #       mylibtmpver="${mylibfullver}"
+       #       maxdots=0
+       #       while [[ ${mylibtmpver} != ${mylib} ]] && [[ ${maxdots} -lt 6 ]]; do
+       #               (( ++maxdots ))
+       #               prevlink=$(readlink -f "../${mylibtmpver}")
+       #               if [[ -n "${prevlink}" ]] ; then
+       #                       if [[ "${mylibtmpver}" != "${mylibfullver}" ]] \
+       #                       && [[ "${prevlink##*/}" != "${mylibfullver}" ]]
+       #                       then
+       #                               # gah this is not totally correct
+       #                               einfo "found previous library, please run"
+       #                               einfo "revdep-rebuild --soname=${mylibtmpver}"
+       #                       fi
+       #                       rm -f "../${mylibtmpver}"
+       #               fi
+       #               ln -snf \
+       #                       $(mysql_strip_double_slash "${ROOT}/${MY_LIBDIR}/${mylibfullver}") \
+       #                       $(mysql_strip_double_slash "${ROOT}/${MY_LIBDIR}/../${mylibtmpver}")
+       #               mylibtmpver=${mylibtmpver%.*}
+       #       done
+       #done
+       #popd
 
        # mind at FEATURES=collision-protect before to remove this
        [ -d "${ROOT}/var/log/mysql" ] \
@@ -753,3 +788,4 @@ pkg_config() {
                einfo "done"
        fi # menusel
 }
+
index 1e6b532cbb3a45452e234e00e80b530dfab60f84..408533d0907a87f1576ecead6471fb640c4459ec 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.15.ebuild,v 1.8 2005/11/23 19:44:22 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.15.ebuild,v 1.9 2005/11/24 14:03:52 vivo Exp $
 
 # helper function, version (integer) may have section separated by dots
 # for readbility
@@ -179,6 +179,16 @@ mysql_init_vars() {
        export DATADIR
 }
 
+mysql_strip_double_slash() {
+       local path="${1}"
+       local newpath="${path/\/\///}"
+       while [[ ${path} != ${newpath} ]]; do
+               path=${newpath}
+               newpath="${path/\/\///}"
+       done
+       echo "${newpath}"
+}
+
 pkg_setup() {
 
        enewgroup mysql 60 || die "problem adding group mysql"
@@ -466,6 +476,24 @@ src_install() {
        mysql_init_vars
        make install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die
 
+       # create globally visible symlinks
+       # TODO : what abaut ndb ?
+       local mylib mylibfullver mylibtmpver maxdots sonamelist
+       pushd "${D}/${MY_LIBDIR}"
+       for mylib in libmysqlclient_r libmysqlclient; do
+               mylibfullver="$(ls "${mylib}.so"* | sort | tail -n 1)"
+               mylibtmpver="${mylibfullver}"
+               maxdots=0
+               while [[ ${mylibtmpver} != ${mylib} ]] && [[ ${maxdots} -lt 6 ]]; do
+                       (( ++maxdots ))
+                       dosym \
+                               $(mysql_strip_double_slash "${MY_LIBDIR}/${mylibfullver}") \
+                               $(mysql_strip_double_slash "${MY_LIBDIR}/../${mylibtmpver}")
+                       mylibtmpver=${mylibtmpver%.*}
+               done
+       done
+       popd
+
        insinto "${MY_INCLUDEDIR}"
        doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
 
@@ -585,32 +613,34 @@ pkg_postinst() {
 
        mysql_init_vars
 
-       # create globally visible symlinks
-       # TODO : what abaut ndb ?
-       local mylib mylibfullver mylibtmpver maxdots sonamelist prevlink
-       pushd "${ROOT}/${MY_LIBDIR}"
-       for mylib in libmysqlclient_r libmysqlclient; do
-               mylibfullver="$(ls "${mylib}.so"* | sort | tail -n 1)"
-               mylibtmpver="${mylibfullver}"
-               maxdots=0
-               while [[ ${mylibtmpver} != ${mylib} ]] && [[ ${maxdots} -lt 6 ]]; do
-                       (( ++maxdots ))
-                       prevlink=$(readlink -f "../${mylibtmpver}")
-                       if [[ -n "${prevlink}" ]] ; then
-                               if [[ "${mylibtmpver}" != "${mylibfullver}" ]] \
-                               && [[ "${prevlink##*/}" != "${mylibfullver}" ]]
-                               then
-                                       # gah this is not totally correct 
-                                       einfo "found previous library, please run"
-                                       einfo "revdep-rebuild --soname=${mylibtmpver}"
-                               fi
-                               rm -f "../${mylibtmpver}"
-                       fi
-                       ln -snf "${mylibfullver}" "../${mylibtmpver}"
-                       mylibtmpver=${mylibtmpver%.*}
-               done
-       done
-       popd
+       ## TODO : make the check
+       ## TODO : what abaut ndb ?
+       #local mylib mylibfullver mylibtmpver maxdots sonamelist prevlink
+       #pushd "${ROOT}/${MY_LIBDIR}"
+       #for mylib in libmysqlclient_r libmysqlclient; do
+       #       mylibfullver="$(ls "${mylib}.so"* | sort | tail -n 1)"
+       #       mylibtmpver="${mylibfullver}"
+       #       maxdots=0
+       #       while [[ ${mylibtmpver} != ${mylib} ]] && [[ ${maxdots} -lt 6 ]]; do
+       #               (( ++maxdots ))
+       #               prevlink=$(readlink -f "../${mylibtmpver}")
+       #               if [[ -n "${prevlink}" ]] ; then
+       #                       if [[ "${mylibtmpver}" != "${mylibfullver}" ]] \
+       #                       && [[ "${prevlink##*/}" != "${mylibfullver}" ]]
+       #                       then
+       #                               # gah this is not totally correct
+       #                               einfo "found previous library, please run"
+       #                               einfo "revdep-rebuild --soname=${mylibtmpver}"
+       #                       fi
+       #                       rm -f "../${mylibtmpver}"
+       #               fi
+       #               ln -snf \
+       #                       $(mysql_strip_double_slash "${ROOT}/${MY_LIBDIR}/${mylibfullver}") \
+       #                       $(mysql_strip_double_slash "${ROOT}/${MY_LIBDIR}/../${mylibtmpver}")
+       #               mylibtmpver=${mylibtmpver%.*}
+       #       done
+       #done
+       #popd
 
        # mind at FEATURES=collision-protect before to remove this
        [ -d "${ROOT}/var/log/mysql" ] \
@@ -754,3 +784,4 @@ pkg_config() {
                einfo "done"
        fi # menusel
 }
+
similarity index 92%
rename from dev-db/mysql/mysql-5.0.16-r2.ebuild
rename to dev-db/mysql/mysql-5.0.16-r3.ebuild
index 9f30e1ca1a285b5c6bb9670369489b35b10746ad..778132280a7d5e862452888347cd568f09d44758 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16-r2.ebuild,v 1.2 2005/11/24 00:55:05 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16-r3.ebuild,v 1.1 2005/11/24 14:03:52 vivo Exp $
 
 # helper function, version (integer) may have section separated by dots
 # for readbility
@@ -181,6 +181,16 @@ mysql_init_vars() {
        export DATADIR
 }
 
+mysql_strip_double_slash() {
+       local path="${1}"
+       local newpath="${path/\/\///}"
+       while [[ ${path} != ${newpath} ]]; do
+               path=${newpath}
+               newpath="${path/\/\///}"
+       done
+       echo "${newpath}"
+}
+
 pkg_setup() {
 
        enewgroup mysql 60 || die "problem adding group mysql"
@@ -472,6 +482,24 @@ src_install() {
        mysql_init_vars
        make install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die
 
+       # create globally visible symlinks
+       # TODO : what abaut ndb ?
+       local mylib mylibfullver mylibtmpver maxdots sonamelist
+       pushd "${D}/${MY_LIBDIR}"
+       for mylib in libmysqlclient_r libmysqlclient libndbclient; do
+               mylibfullver="$(ls "${mylib}.so"* | sort | tail -n 1)"
+               mylibtmpver="${mylibfullver}"
+               maxdots=0
+               while [[ ${mylibtmpver} != ${mylib} ]] && [[ ${maxdots} -lt 6 ]]; do
+                       (( ++maxdots ))
+                       dosym \
+                               $(mysql_strip_double_slash "${MY_LIBDIR}/${mylibfullver}") \
+                               $(mysql_strip_double_slash "${MY_LIBDIR}/../${mylibtmpver}")
+                       mylibtmpver=${mylibtmpver%.*}
+               done
+       done
+       popd
+
        insinto "${MY_INCLUDEDIR}"
        doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
 
@@ -591,32 +619,34 @@ pkg_postinst() {
 
        mysql_init_vars
 
-       # create globally visible symlinks
-       # TODO : what abaut ndb ?
-       local mylib mylibfullver mylibtmpver maxdots sonamelist prevlink
-       pushd "${ROOT}/${MY_LIBDIR}"
-       for mylib in libmysqlclient_r libmysqlclient; do
-               mylibfullver="$(ls "${mylib}.so"* | sort | tail -n 1)"
-               mylibtmpver="${mylibfullver}"
-               maxdots=0
-               while [[ ${mylibtmpver} != ${mylib} ]] && [[ ${maxdots} -lt 6 ]]; do
-                       (( ++maxdots ))
-                       prevlink=$(readlink -f "../${mylibtmpver}")
-                       if [[ -n "${prevlink}" ]] ; then
-                               if [[ "${mylibtmpver}" != "${mylibfullver}" ]] \
-                               && [[ "${prevlink##*/}" != "${mylibfullver}" ]]
-                               then
-                                       # gah this is not totally correct 
-                                       einfo "found previous library, please run"
-                                       einfo "revdep-rebuild --soname=${mylibtmpver}"
-                               fi
-                               rm -f "../${mylibtmpver}"
-                       fi
-                       ln -snf "${mylibfullver}" "../${mylibtmpver}"
-                       mylibtmpver=${mylibtmpver%.*}
-               done
-       done
-       popd
+       ## TODO : make the check
+       ## TODO : what abaut ndb ?
+       #local mylib mylibfullver mylibtmpver maxdots sonamelist prevlink
+       #pushd "${ROOT}/${MY_LIBDIR}"
+       #for mylib in libmysqlclient_r libmysqlclient libndbclient; do
+       #       mylibfullver="$(ls "${mylib}.so"* | sort | tail -n 1)"
+       #       mylibtmpver="${mylibfullver}"
+       #       maxdots=0
+       #       while [[ ${mylibtmpver} != ${mylib} ]] && [[ ${maxdots} -lt 6 ]]; do
+       #               (( ++maxdots ))
+       #               prevlink=$(readlink -f "../${mylibtmpver}")
+       #               if [[ -n "${prevlink}" ]] ; then
+       #                       if [[ "${mylibtmpver}" != "${mylibfullver}" ]] \
+       #                       && [[ "${prevlink##*/}" != "${mylibfullver}" ]]
+       #                       then
+       #                               # gah this is not totally correct
+       #                               einfo "found previous library, please run"
+       #                               einfo "revdep-rebuild --soname=${mylibtmpver}"
+       #                       fi
+       #                       rm -f "../${mylibtmpver}"
+       #               fi
+       #               ln -snf \
+       #                       $(mysql_strip_double_slash "${ROOT}/${MY_LIBDIR}/${mylibfullver}") \
+       #                       $(mysql_strip_double_slash "${ROOT}/${MY_LIBDIR}/../${mylibtmpver}")
+       #               mylibtmpver=${mylibtmpver%.*}
+       #       done
+       #done
+       #popd
 
        # mind at FEATURES=collision-protect before to remove this
        [ -d "${ROOT}/var/log/mysql" ] \
@@ -734,3 +764,4 @@ pkg_config() {
        rm  "${sqltmp}"
        einfo "done"
 }
+
index f8270da519a0c3306d1e41c45f3014d448ce349b..e8a433627af4f87654ad998b077b59078eb4adf8 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16-r30.ebuild,v 1.3 2005/11/24 00:55:05 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16-r30.ebuild,v 1.4 2005/11/24 14:03:52 vivo Exp $
 
 # helper function, version (integer) may have section separated by dots
 # for readbility
@@ -179,6 +179,16 @@ mysql_init_vars() {
        export DATADIR
 }
 
+mysql_strip_double_slash() {
+       local path="${1}"
+       local newpath="${path/\/\///}"
+       while [[ ${path} != ${newpath} ]]; do
+               path=${newpath}
+               newpath="${path/\/\///}"
+       done
+       echo "${newpath}"
+}
+
 pkg_setup() {
 
        enewgroup mysql 60 || die "problem adding group mysql"
@@ -470,6 +480,24 @@ src_install() {
        mysql_init_vars
        make install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die
 
+       # create globally visible symlinks
+       # TODO : what abaut ndb ?
+       local mylib mylibfullver mylibtmpver maxdots sonamelist
+       pushd "${D}/${MY_LIBDIR}"
+       for mylib in libmysqlclient_r libmysqlclient; do
+               mylibfullver="$(ls "${mylib}.so"* | sort | tail -n 1)"
+               mylibtmpver="${mylibfullver}"
+               maxdots=0
+               while [[ ${mylibtmpver} != ${mylib} ]] && [[ ${maxdots} -lt 6 ]]; do
+                       (( ++maxdots ))
+                       dosym \
+                               $(mysql_strip_double_slash "${MY_LIBDIR}/${mylibfullver}") \
+                               $(mysql_strip_double_slash "${MY_LIBDIR}/../${mylibtmpver}")
+                       mylibtmpver=${mylibtmpver%.*}
+               done
+       done
+       popd
+
        insinto "${MY_INCLUDEDIR}"
        doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
 
@@ -589,32 +617,34 @@ pkg_postinst() {
 
        mysql_init_vars
 
-       # create globally visible symlinks
-       # TODO : what abaut ndb ?
-       local mylib mylibfullver mylibtmpver maxdots sonamelist prevlink
-       pushd "${ROOT}/${MY_LIBDIR}"
-       for mylib in libmysqlclient_r libmysqlclient; do
-               mylibfullver="$(ls "${mylib}.so"* | sort | tail -n 1)"
-               mylibtmpver="${mylibfullver}"
-               maxdots=0
-               while [[ ${mylibtmpver} != ${mylib} ]] && [[ ${maxdots} -lt 6 ]]; do
-                       (( ++maxdots ))
-                       prevlink=$(readlink -f "../${mylibtmpver}")
-                       if [[ -n "${prevlink}" ]] ; then
-                               if [[ "${mylibtmpver}" != "${mylibfullver}" ]] \
-                               && [[ "${prevlink##*/}" != "${mylibfullver}" ]]
-                               then
-                                       # gah this is not totally correct 
-                                       einfo "found previous library, please run"
-                                       einfo "revdep-rebuild --soname=${mylibtmpver}"
-                               fi
-                               rm -f "../${mylibtmpver}"
-                       fi
-                       ln -snf "${mylibfullver}" "../${mylibtmpver}"
-                       mylibtmpver=${mylibtmpver%.*}
-               done
-       done
-       popd
+       ## TODO : make the check
+       ## TODO : what abaut ndb ?
+       #local mylib mylibfullver mylibtmpver maxdots sonamelist prevlink
+       #pushd "${ROOT}/${MY_LIBDIR}"
+       #for mylib in libmysqlclient_r libmysqlclient; do
+       #       mylibfullver="$(ls "${mylib}.so"* | sort | tail -n 1)"
+       #       mylibtmpver="${mylibfullver}"
+       #       maxdots=0
+       #       while [[ ${mylibtmpver} != ${mylib} ]] && [[ ${maxdots} -lt 6 ]]; do
+       #               (( ++maxdots ))
+       #               prevlink=$(readlink -f "../${mylibtmpver}")
+       #               if [[ -n "${prevlink}" ]] ; then
+       #                       if [[ "${mylibtmpver}" != "${mylibfullver}" ]] \
+       #                       && [[ "${prevlink##*/}" != "${mylibfullver}" ]]
+       #                       then
+       #                               # gah this is not totally correct
+       #                               einfo "found previous library, please run"
+       #                               einfo "revdep-rebuild --soname=${mylibtmpver}"
+       #                       fi
+       #                       rm -f "../${mylibtmpver}"
+       #               fi
+       #               ln -snf \
+       #                       $(mysql_strip_double_slash "${ROOT}/${MY_LIBDIR}/${mylibfullver}") \
+       #                       $(mysql_strip_double_slash "${ROOT}/${MY_LIBDIR}/../${mylibtmpver}")
+       #               mylibtmpver=${mylibtmpver%.*}
+       #       done
+       #done
+       #popd
 
        # mind at FEATURES=collision-protect before to remove this
        [ -d "${ROOT}/var/log/mysql" ] \
@@ -758,3 +788,4 @@ pkg_config() {
                einfo "done"
        fi # menusel
 }
+