From: Robin H. Johnson Date: Mon, 26 Feb 2007 09:11:41 +0000 (+0000) Subject: Bug #150310, #160053 - cleanups of autotools stuff. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=407abf22a7e67f949c8745fdd30098d5ed2d50e3;p=gentoo.git Bug #150310, #160053 - cleanups of autotools stuff. Package-Manager: portage-2.1.2-r11 --- diff --git a/sys-libs/nss-db/ChangeLog b/sys-libs/nss-db/ChangeLog index e3cebcc4ac8c..5d88d4abd2ec 100644 --- a/sys-libs/nss-db/ChangeLog +++ b/sys-libs/nss-db/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-libs/nss-db # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/ChangeLog,v 1.12 2007/02/22 00:39:35 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/ChangeLog,v 1.13 2007/02/26 09:11:41 robbat2 Exp $ + +*nss-db-2.2.3_pre1-r2 (26 Feb 2007) + + 26 Feb 2007; Robin H. Johnson + +nss-db-2.2.3_pre1-r2.ebuild: + Bug #150310, #160053 - cleanups of autotools stuff. 22 Feb 2007; Markus Ullmann ChangeLog: Redigest for Manifest2 diff --git a/sys-libs/nss-db/Manifest b/sys-libs/nss-db/Manifest index 29b698b2ebd6..09f00baff58a 100644 --- a/sys-libs/nss-db/Manifest +++ b/sys-libs/nss-db/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX db3.patch 1174 RMD160 eeac21cb96b84070ddd1cb4975e4c42793711f12 SHA1 1733d2d5ee9cd8e6075bcb2d37b40291985d8721 SHA256 2db3285c19657c9dfad4ced22e17d0bf19268c12779e781716cd87db6fac7bf0 MD5 03cdab663eb8542cea7c07707d596740 files/db3.patch 1174 RMD160 eeac21cb96b84070ddd1cb4975e4c42793711f12 files/db3.patch 1174 @@ -26,14 +23,18 @@ EBUILD nss-db-2.2.3_pre1-r1.ebuild 2870 RMD160 dba2be0a893a49bd632db8bff7e56d823 MD5 52dc85e87b53c85997773436f6243536 nss-db-2.2.3_pre1-r1.ebuild 2870 RMD160 dba2be0a893a49bd632db8bff7e56d82307f22e3 nss-db-2.2.3_pre1-r1.ebuild 2870 SHA256 4feb4dd080f4e6d7c56871db114fbf1e9a02efbc54f157b4ab84f625b7bf1268 nss-db-2.2.3_pre1-r1.ebuild 2870 +EBUILD nss-db-2.2.3_pre1-r2.ebuild 3212 RMD160 128fc4468f40aaa2f67ca29637851fa7bbb91bb8 SHA1 38a0fa0ad6779bc61178d074b5e9005ce0cd1443 SHA256 ce85d588fc5d47f2643a023d8838d46fbe5b1e77abe6c4a092a01d5e621da0ea +MD5 e0494b6eaa512110f750c17d4b0cd8c4 nss-db-2.2.3_pre1-r2.ebuild 3212 +RMD160 128fc4468f40aaa2f67ca29637851fa7bbb91bb8 nss-db-2.2.3_pre1-r2.ebuild 3212 +SHA256 ce85d588fc5d47f2643a023d8838d46fbe5b1e77abe6c4a092a01d5e621da0ea nss-db-2.2.3_pre1-r2.ebuild 3212 EBUILD nss-db-2.2.3_pre1.ebuild 2662 RMD160 8f437777ad90aeef90d37f19d0689527485ad969 SHA1 8c8da53746e255fe678f84df4d28844ef8491215 SHA256 8b1144acdc9f3c8b5cb987a197088267e2a2b2b1de0730fe93ba8a1971d7387a MD5 bc522ff696b7b028f69bb02f65af0e5b nss-db-2.2.3_pre1.ebuild 2662 RMD160 8f437777ad90aeef90d37f19d0689527485ad969 nss-db-2.2.3_pre1.ebuild 2662 SHA256 8b1144acdc9f3c8b5cb987a197088267e2a2b2b1de0730fe93ba8a1971d7387a nss-db-2.2.3_pre1.ebuild 2662 -MISC ChangeLog 1963 RMD160 30d91d2b3ec6400af03c12cd5a88225e473463d7 SHA1 347f2f9f9e5d830b7b1b2fb637080817d5b3588f SHA256 0210a385097c186b6c44b178889461b0667bbd956e8d947b551a544bb529f222 -MD5 31f5481082d5ed0c71d16c2fb30780e4 ChangeLog 1963 -RMD160 30d91d2b3ec6400af03c12cd5a88225e473463d7 ChangeLog 1963 -SHA256 0210a385097c186b6c44b178889461b0667bbd956e8d947b551a544bb529f222 ChangeLog 1963 +MISC ChangeLog 2142 RMD160 71ae6af3872d37c68ba3753dc58117a978088d52 SHA1 7fb895e840a8c60e7c01273324a6553ba611fc3c SHA256 ab3d7101a158de6e19e99c09ddfbe0960dc52678d34b7136ddf26586c4d951db +MD5 e8709060ec42c5f1ac05e7e60326e35a ChangeLog 2142 +RMD160 71ae6af3872d37c68ba3753dc58117a978088d52 ChangeLog 2142 +SHA256 ab3d7101a158de6e19e99c09ddfbe0960dc52678d34b7136ddf26586c4d951db ChangeLog 2142 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -47,10 +48,6 @@ SHA256 966017a89c24f172276f16f3d357b3d1f8cd151f9873dfb235f3f3c14c96fbed files/di MD5 2c74ff8d4ff5dcae1c0836c63364cd9d files/digest-nss-db-2.2.3_pre1-r1 1081 RMD160 ce1e4bb506eec03fcfdbb141cd6531b22cf00967 files/digest-nss-db-2.2.3_pre1-r1 1081 SHA256 966017a89c24f172276f16f3d357b3d1f8cd151f9873dfb235f3f3c14c96fbed files/digest-nss-db-2.2.3_pre1-r1 1081 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) - -iD8DBQFF3OXfz974XjDVpbkRArZNAKCTJOllmR66E45GBbGKWtgApG6/9wCdHlKt -IrZsiutyf+qHcYkQBm2Zjjo= -=ievs ------END PGP SIGNATURE----- +MD5 2c74ff8d4ff5dcae1c0836c63364cd9d files/digest-nss-db-2.2.3_pre1-r2 1081 +RMD160 ce1e4bb506eec03fcfdbb141cd6531b22cf00967 files/digest-nss-db-2.2.3_pre1-r2 1081 +SHA256 966017a89c24f172276f16f3d357b3d1f8cd151f9873dfb235f3f3c14c96fbed files/digest-nss-db-2.2.3_pre1-r2 1081 diff --git a/sys-libs/nss-db/files/digest-nss-db-2.2.3_pre1-r2 b/sys-libs/nss-db/files/digest-nss-db-2.2.3_pre1-r2 new file mode 100644 index 000000000000..ffeb884650a4 --- /dev/null +++ b/sys-libs/nss-db/files/digest-nss-db-2.2.3_pre1-r2 @@ -0,0 +1,12 @@ +MD5 e26590083b9f32d2c134d204ba0ad72e nss_db-2.2.3pre1-dbopen.patch.bz2 258 +RMD160 2a7b96393cf3c338c8bc1041e26824dbca74aa57 nss_db-2.2.3pre1-dbopen.patch.bz2 258 +SHA256 9d7bf1ef17ca91c59c234bfa96d4b9e3f866a792c609a02cc6d9daa601dee1d3 nss_db-2.2.3pre1-dbopen.patch.bz2 258 +MD5 d02a1a231c70e28320ed21e883be4d6a nss_db-2.2.3pre1-dbupgrade.patch.bz2 263 +RMD160 90ad8e330a7677f8ebd4a2fd210d258d8ba1e496 nss_db-2.2.3pre1-dbupgrade.patch.bz2 263 +SHA256 31052eb79cc4aa60f639a3a57d9225630327ee6c728d62eda1d9c91ea7d70dc3 nss_db-2.2.3pre1-dbupgrade.patch.bz2 263 +MD5 ec455e427bf7bf4daba3427fd4066db3 nss_db-2.2.3pre1-external.patch.bz2 1870 +RMD160 d85fdb31935c5ab75ed80b1159155f5fa5b8a2e5 nss_db-2.2.3pre1-external.patch.bz2 1870 +SHA256 dbc45a4dc7c977fae2193e0a14fdb862a5f42479ac40da0d4772d5d66e95ade0 nss_db-2.2.3pre1-external.patch.bz2 1870 +MD5 b4440ba2865d28e9068e465426c19ede nss_db-2.2.3pre1.tar.gz 235360 +RMD160 a511fcc1dc7937e13e84ccd125d688463ac52555 nss_db-2.2.3pre1.tar.gz 235360 +SHA256 0c5d677a49c7bf6b9318bf40adf335839a668d1c7509e9b1915bd22a9e0ac694 nss_db-2.2.3pre1.tar.gz 235360 diff --git a/sys-libs/nss-db/nss-db-2.2.3_pre1-r2.ebuild b/sys-libs/nss-db/nss-db-2.2.3_pre1-r2.ebuild new file mode 100644 index 000000000000..d055a65e429b --- /dev/null +++ b/sys-libs/nss-db/nss-db-2.2.3_pre1-r2.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/nss-db-2.2.3_pre1-r2.ebuild,v 1.1 2007/02/26 09:11:41 robbat2 Exp $ + +inherit eutils versionator multilib autotools + +MY_PN="${PN/-/_}" +MY_PV="${PV/_}" +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="Allows important system files to be stored in a fast database file rather than plain text" +HOMEPAGE="http://sources.redhat.com/glibc/" +SRC_URI="ftp://sources.redhat.com/pub/glibc/old-releases/${MY_P}.tar.gz + mirror://gentoo/${MY_P}-external.patch.bz2 + mirror://gentoo/${MY_P}-dbupgrade.patch.bz2 + mirror://gentoo/${MY_P}-dbopen.patch.bz2" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~ppc ~x86" +IUSE="nls" + +# awk and make ARE needed at runtime! +# and this didn't compile on BSD libc either +RDEPEND=">=sys-libs/db-4 + sys-apps/gawk + sys-devel/make + >=sys-libs/glibc-2.3" +# We really do need gettext to compile always :-( +DEPEND="${RDEPEND} + sys-devel/gettext" + +S="${WORKDIR}/${MY_P}" + +db_getver() { + local DBPKG + DBPKG="$(best_version '>=sys-libs/db-4*')" + echo "${DBPKG//sys-libs\/db-}" +} + +db_getversym() { + local DBVER DBSYMSUFFIX + [ -n "${1}" ] && DBVER="${1}" || DBVER="$(db_getver)" + DBVER=($(get_version_components "${DBVER}")) + if has_version '>=sys-libs/db-4.3'; then + DBSYMSUFFIX="" + else + let DBSYMSUFFIX=(${DBVER[0]}*1000)+${DBVER[1]} + DBSYMSUFFIX=_${DBSYMSUFFIX} + fi + echo "${DBSYMSUFFIX}" +} + +src_unpack() { + unpack ${MY_P}.tar.gz + EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${MY_P}-external.patch.bz2 + EPATCH_OPTS="-p0 -d ${S}" epatch ${DISTDIR}/${MY_P}-dbupgrade.patch.bz2 + EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${MY_P}-dbopen.patch.bz2 + EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-root-upgrade-only.patch + + # make sure we use the correct version of DB + cd ${S} + DB_PV="$(db_getver)" + DB_SYM="$(db_getversym ${DB_PV})" + DB_PV_MAJORMINOR="$(get_version_component_range 1-2 ${DB_PV})" + sed -i configure.in \ + -e "s!db.h!db${DB_PV_MAJORMINOR}/db.h!g" \ + -e "s!db, db_version!db-${DB_PV_MAJORMINOR}, db_version${DB_SYM}!g" + + # fix ancient broken-ness + for f in po/Makefile.in.in ./intl/Makefile.in; do + egrep -q '^mkinstalldirs = .*case.*esac' ${f} && \ + sed -i ${f} \ + -e '/^mkinstalldirs = /s,\(mkinstalldirs =\).*,\1 $(top_builddir)/./mkinstalldirs,' + done + + + # Fixes thanks to Flameeyes + cp /usr/share/gettext/config.rpath . # missing + sed -i -e '/makedb_LDADD/i makedb_CFLAGS=$(AM_CFLAGS)' src/Makefile.am + sed -i -e '/AC_PROG_CC/a AC_PROG_CC_C_O' configure.in + eautoreconf + + # This is an evil target and we don't like it + sed -i -e '/^install-data-am:.*install-data-local/s,install-data-local,,g' ${S}/src/Makefile.in +} + +src_compile() { + econf -C --libdir=/$(get_libdir) `use_enable nls` || die + emake || die +} + +src_install() { + emake -j1 DESTDIR="${D}" slibdir="/$(get_libdir)" install || \ + die "failed emake install" + + into /usr + insinto /usr/share/${PN} + doins db-Makefile + + exeinto /usr/sbin + doexe ${FILESDIR}/remake-all-db + + dodoc ABOUT-NLS AUTHORS COPYING* ChangeLog INSTALL NEWS README THANKS + + dodir /usr/$(get_libdir)/ + mv ${D}/$(get_libdir)/*.la ${D}/usr/$(get_libdir)/ || \ + die "failed to set up .la" +}