From 45873a3f7b41a7ea7a74222f06a18f978203ff6d Mon Sep 17 00:00:00 2001 From: Paul de Vrieze Date: Sun, 21 May 2006 10:29:17 +0000 Subject: Make klibido compile with later db versions Package-Manager: portage-2.1_rc1-r2 --- net-nntp/klibido/ChangeLog | 8 ++++-- net-nntp/klibido/Manifest | 39 +++++++++++++++++---------- net-nntp/klibido/files/digest-klibido-0.2.4.1 | 2 ++ net-nntp/klibido/klibido-0.2.4.1.ebuild | 23 +++++++++++----- 4 files changed, 49 insertions(+), 23 deletions(-) diff --git a/net-nntp/klibido/ChangeLog b/net-nntp/klibido/ChangeLog index 91f291971bea..1268808e7685 100644 --- a/net-nntp/klibido/ChangeLog +++ b/net-nntp/klibido/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-nntp/klibido -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nntp/klibido/ChangeLog,v 1.16 2005/11/17 08:50:46 flameeyes Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-nntp/klibido/ChangeLog,v 1.17 2006/05/21 10:29:17 pauldv Exp $ + + 21 May 2006; klibido-0.2.4.1.ebuild: + Make klibido work with later db versions. Fixes bug #133587. It uses + db-use.eclass 17 Nov 2005; Diego Pettenò klibido-0.2.3-r1.ebuild, klibido-0.2.4.1.ebuild: diff --git a/net-nntp/klibido/Manifest b/net-nntp/klibido/Manifest index e97ac61a8ecc..9e4148b94180 100644 --- a/net-nntp/klibido/Manifest +++ b/net-nntp/klibido/Manifest @@ -1,17 +1,28 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 0de521e8378389b54bc2a5a05f0059dc ChangeLog 2809 +AUX 0.2.3-availablegroups.patch 680 RMD160 1c2fd82ecce80c0754faadb9d1e9e2ae8156d03b SHA1 e1bb593fe58e61bb88d464484e418d628dd15f02 SHA256 1eb4ccf2e4b10a14bdd832cfce0faeda863f58d4129c2cf9a446ecf135e7b580 size 680 MD5 562c45d10b93fb7abdb28bf180066e82 files/0.2.3-availablegroups.patch 680 -MD5 b9341c26322876dabb2e10261c976076 files/digest-klibido-0.2.3-r1 65 -MD5 11ff15e55098abf0e104d3c988f2f371 files/digest-klibido-0.2.4.1 67 +RMD160 1c2fd82ecce80c0754faadb9d1e9e2ae8156d03b files/0.2.3-availablegroups.patch 680 +SHA256 1eb4ccf2e4b10a14bdd832cfce0faeda863f58d4129c2cf9a446ecf135e7b580 files/0.2.3-availablegroups.patch 680 +DIST klibido-0.2.3.tar.gz 718043 size 718043 +DIST klibido-0.2.4.1.tar.gz 798084 RMD160 52b09d4af13ab261677204ff68fb5c94445c5a41 SHA256 c8a1d015b929490cb18fa9deff876a3ce4b3c17ea4ed91783d83302782efcaf1 size 798084 +EBUILD klibido-0.2.3-r1.ebuild 902 RMD160 9c797ef3b3766b1ff4c99377608f3eb7ec353135 SHA1 eeda23271ed24d9c72222f9003e00965c0b821bd SHA256 ab69df8af8718ed7f22ed2574c90c8187a6140f039043f9255d782b3b90320dd size 902 MD5 53f7b9dfd8377ef07e870769803c5499 klibido-0.2.3-r1.ebuild 902 -MD5 b33a272b461140625c8859668350c44e klibido-0.2.4.1.ebuild 807 +RMD160 9c797ef3b3766b1ff4c99377608f3eb7ec353135 klibido-0.2.3-r1.ebuild 902 +SHA256 ab69df8af8718ed7f22ed2574c90c8187a6140f039043f9255d782b3b90320dd klibido-0.2.3-r1.ebuild 902 +EBUILD klibido-0.2.4.1.ebuild 1080 RMD160 6bb74745d82c8f388138567a2ac0b0f1cdf3153c SHA1 313222f8136f8cb6c3b950b6b9b54ab0d776c0a0 SHA256 1e11cbd2db7d6aa9944d2c587302cc8c43f78e5f4cd6f315d549b7bd43e960ff size 1080 +MD5 4125e50d730a8764f3906d0f76e748c0 klibido-0.2.4.1.ebuild 1080 +RMD160 6bb74745d82c8f388138567a2ac0b0f1cdf3153c klibido-0.2.4.1.ebuild 1080 +SHA256 1e11cbd2db7d6aa9944d2c587302cc8c43f78e5f4cd6f315d549b7bd43e960ff klibido-0.2.4.1.ebuild 1080 +MISC ChangeLog 2954 RMD160 5a9ca2817acde56a567608c3de216864e15a9199 SHA1 6730e099f0ae271af50e08e4471ffe8e6aed755d SHA256 380ab79f2acfe2f8397f62124189dbf892832b24e717bc67432c63f6cdb3fcc6 size 2954 +MD5 690ffbb8197a6fbf2ba94281d2562097 ChangeLog 2954 +RMD160 5a9ca2817acde56a567608c3de216864e15a9199 ChangeLog 2954 +SHA256 380ab79f2acfe2f8397f62124189dbf892832b24e717bc67432c63f6cdb3fcc6 ChangeLog 2954 +MISC metadata.xml 161 RMD160 f1947f39ceb22269275e1b59023c4eadcdbc1a15 SHA1 5d3eb0725c80eb73d935d7dfbd653a7c1a2103e7 SHA256 8031b551b7913d7c088a55811814db35dad801454d369d05ff365d33cd722153 size 161 MD5 d4764f5c17f5e0b416f7ddf271c77d71 metadata.xml 161 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDfER5AiZjviIA2XgRAn/iAJ9y2TrJQoGSB5EpFET9G3/obO75FwCfckEB -LQrc4IGk0AuXSOVjhp5k3gk= -=eAiO ------END PGP SIGNATURE----- +RMD160 f1947f39ceb22269275e1b59023c4eadcdbc1a15 metadata.xml 161 +SHA256 8031b551b7913d7c088a55811814db35dad801454d369d05ff365d33cd722153 metadata.xml 161 +MD5 b9341c26322876dabb2e10261c976076 files/digest-klibido-0.2.3-r1 65 +RMD160 5ad08754ca91df833cd5ea281a2173c7579d669c files/digest-klibido-0.2.3-r1 65 +SHA256 6089575119bc9b31cfba94d6532e41444864333a2645dd1ac47b7cf2a561a1ed files/digest-klibido-0.2.3-r1 65 +MD5 61dd583e25074911841f21f920898396 files/digest-klibido-0.2.4.1 247 +RMD160 caeccbb659f7dbf3e4ec2f3f483d8e01e05725d1 files/digest-klibido-0.2.4.1 247 +SHA256 b846dcf87d8feb22c76104de1691f025925c4058ec086a9c26516423864b6b88 files/digest-klibido-0.2.4.1 247 diff --git a/net-nntp/klibido/files/digest-klibido-0.2.4.1 b/net-nntp/klibido/files/digest-klibido-0.2.4.1 index 4225e6541b3b..c9910d49e9a8 100644 --- a/net-nntp/klibido/files/digest-klibido-0.2.4.1 +++ b/net-nntp/klibido/files/digest-klibido-0.2.4.1 @@ -1 +1,3 @@ MD5 111a6e714509d0619a0b29e20a4ded65 klibido-0.2.4.1.tar.gz 798084 +RMD160 52b09d4af13ab261677204ff68fb5c94445c5a41 klibido-0.2.4.1.tar.gz 798084 +SHA256 c8a1d015b929490cb18fa9deff876a3ce4b3c17ea4ed91783d83302782efcaf1 klibido-0.2.4.1.tar.gz 798084 diff --git a/net-nntp/klibido/klibido-0.2.4.1.ebuild b/net-nntp/klibido/klibido-0.2.4.1.ebuild index c01aefff2039..3776692a8fe1 100644 --- a/net-nntp/klibido/klibido-0.2.4.1.ebuild +++ b/net-nntp/klibido/klibido-0.2.4.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nntp/klibido/klibido-0.2.4.1.ebuild,v 1.2 2005/11/17 08:50:46 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nntp/klibido/klibido-0.2.4.1.ebuild,v 1.3 2006/05/21 10:29:17 pauldv Exp $ -inherit kde versionator +inherit kde db-use DESCRIPTION="KDE Linux Binaries Downloader" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" @@ -19,13 +19,22 @@ DEPEND="${RDEPEND} need-kde 3 +src_unpack() { + kde_src_unpack + dbincldir="$(db_includedir 4.4 4.3 4.2 4.1)" || die "unable to find db" + einfo "db include dir = ${dbincldir}" + if [ ! -d ${dbincldir} ]; then + die "Db include dir does not exist" + fi + sed -i -e "s,-I/usr/include/db4,-I${dbincldir}," ${S}/src/Makefile.am + sed -i -e "s,-I/usr/include/db4,-I${dbincldir}," ${S}/src/Makefile.in +} + src_compile() { - local libdbver="$(best_version sys-libs/db)" - libdbver="${libdbver/sys-libs\/db-/}" - libdbver="$(get_version_component_range 1-2 ${libdbver})" +# dbincldir="$(db_includedir 4.4 4.3 4.2 4.1)" || die "unable to find db" +# --with-extra-includes="${dbincldir}/" myconf="${myconf} - --with-extra-includes=/usr/include/db${libdbver}/ $(use_enable debug) " kde_src_compile -- cgit v1.2.3-65-gdbad