diff options
author | Simon Stelling <blubb@gentoo.org> | 2005-10-08 12:50:35 +0000 |
---|---|---|
committer | Simon Stelling <blubb@gentoo.org> | 2005-10-08 12:50:35 +0000 |
commit | a67609b22ac6b2c6ed675d0a3f549c30e3f7f2a4 (patch) | |
tree | e3a2a9fd1b90f9075f8ad34d7088ebf8078840b1 /sys-libs | |
parent | Removing 1.9* versions (diff) | |
download | historical-a67609b22ac6b2c6ed675d0a3f549c30e3f7f2a4.tar.gz historical-a67609b22ac6b2c6ed675d0a3f549c30e3f7f2a4.tar.bz2 historical-a67609b22ac6b2c6ed675d0a3f549c30e3f7f2a4.zip |
backport -r1 changes to 0.62, no need to do a revision bump for multilib-strict fixes
Package-Manager: portage-2.0.51.22-r3
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/pwdb/ChangeLog | 7 | ||||
-rw-r--r-- | sys-libs/pwdb/Manifest | 6 | ||||
-rw-r--r-- | sys-libs/pwdb/files/digest-pwdb-0.62-r1 | 1 | ||||
-rw-r--r-- | sys-libs/pwdb/pwdb-0.62-r1.ebuild | 69 | ||||
-rw-r--r-- | sys-libs/pwdb/pwdb-0.62.ebuild | 16 |
5 files changed, 16 insertions, 83 deletions
diff --git a/sys-libs/pwdb/ChangeLog b/sys-libs/pwdb/ChangeLog index 117b71df8e5a..89670dca4cf8 100644 --- a/sys-libs/pwdb/ChangeLog +++ b/sys-libs/pwdb/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-libs/pwdb # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/ChangeLog,v 1.31 2005/02/03 21:47:57 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/ChangeLog,v 1.32 2005/10/08 12:50:35 blubb Exp $ + + 08 Oct 2005; Simon Stelling <blubb@gentoo.org> pwdb-0.62.ebuild, + -pwdb-0.62-r1.ebuild: + backport -r1 changes to 0.62, no need to do a revision bump for + multilib-strict fixes *pwdb-0.62-r1 (03 Feb 2005) diff --git a/sys-libs/pwdb/Manifest b/sys-libs/pwdb/Manifest index a5738fb91625..b0264420c356 100644 --- a/sys-libs/pwdb/Manifest +++ b/sys-libs/pwdb/Manifest @@ -1,9 +1,7 @@ -MD5 8c254cb94d7bf554f7f292b7953a6276 ChangeLog 3741 +MD5 97c58cf064760b2aeb64c91f73e4b647 ChangeLog 3918 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 -MD5 68cc91b4fccb23b569515682934c931e pwdb-0.62.ebuild 1604 -MD5 143df13f7fb71ce5df27f14dbac8c1d6 pwdb-0.62-r1.ebuild 1719 +MD5 7a17e8560e8f8e8efe9f9c87d5ebe774 pwdb-0.62.ebuild 1655 MD5 8cc9a65a57937cd962ff641cf94e40c3 files/digest-pwdb-0.62 61 MD5 0d0c7a6216f5cf079472dfe36ea9d71c files/passwd 143 -MD5 8cc9a65a57937cd962ff641cf94e40c3 files/digest-pwdb-0.62-r1 61 MD5 bf4eb22a793eb0683d8c62b4677d66f8 files/pwdb-0.62-selinux.patch 10567 MD5 f2d1888e60ba62137f53ed5378eb7e25 files/pwdb-0.62-use-gcc-as-linker.patch 508 diff --git a/sys-libs/pwdb/files/digest-pwdb-0.62-r1 b/sys-libs/pwdb/files/digest-pwdb-0.62-r1 deleted file mode 100644 index fdf881196ce6..000000000000 --- a/sys-libs/pwdb/files/digest-pwdb-0.62-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 1a1fd0312040ef37aa741d09465774b4 pwdb-0.62.tar.gz 133183 diff --git a/sys-libs/pwdb/pwdb-0.62-r1.ebuild b/sys-libs/pwdb/pwdb-0.62-r1.ebuild deleted file mode 100644 index fbdf2e87d663..000000000000 --- a/sys-libs/pwdb/pwdb-0.62-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/pwdb-0.62-r1.ebuild,v 1.1 2005/02/03 21:47:57 eradicator Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="Password database" -HOMEPAGE="http://packages.gentoo.org/ebuilds/?pwdb-${PVR}" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0" -#KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86" -# -r1 just has some multilib cleanups -KEYWORDS="~amd64" -IUSE="selinux" - -DEPEND="virtual/libc - selinux? ( sys-libs/libselinux )" - -src_unpack () { - unpack ${A} - - cd ${S} - # Uses gcc as linker needed for hppa, but good idea in general. - epatch ${FILESDIR}/${P}-use-gcc-as-linker.patch - - use selinux && epatch ${FILESDIR}/${P}-selinux.patch - - sed -i \ - -e "s/^DIRS = .*/DIRS = libpwdb/" \ - -e "s:EXTRAS += :EXTRAS += ${CFLAGS} :" \ - Makefile - sed -i -e "s/=gcc/=$(tc-getCC)/g" default.defs -} - -src_compile() { - filter-flags -fstack-protector - - # author has specified application to be compiled with `-g` - # no problem, but with ccc `-g` disables optimisation to make - # debugging easier, `-g3` enables debugging and optimisation - [ "${ARCH}" = "alpha" -a "${CC}" = "ccc" ] && append-flags -g3 - - emake || die -} - -src_install() { - dodir /$(get_libdir) /usr/$(get_libdir) /usr/include/pwdb - make \ - INCLUDED=${D}/usr/include/pwdb \ - LIBDIR=${D}/$(get_libdir) \ - LDCONFIG="echo" \ - install || die - - preplib / - mv ${D}/$(get_libdir)/*.a ${D}/usr/$(get_libdir) - - # See bug #4411 for more info - gen_usr_ldscript libpwdb.so - - insinto /etc - doins conf/pwdb.conf - - dodoc CHANGES CREDITS README - dohtml -r doc - docinto txt - dodoc doc/*.txt -} diff --git a/sys-libs/pwdb/pwdb-0.62.ebuild b/sys-libs/pwdb/pwdb-0.62.ebuild index 7f22b0d9225e..25973cd01f67 100644 --- a/sys-libs/pwdb/pwdb-0.62.ebuild +++ b/sys-libs/pwdb/pwdb-0.62.ebuild @@ -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/sys-libs/pwdb/pwdb-0.62.ebuild,v 1.20 2005/05/22 02:01:38 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/pwdb-0.62.ebuild,v 1.21 2005/10/08 12:50:35 blubb Exp $ inherit eutils flag-o-matic @@ -10,10 +10,11 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="|| ( BSD GPL-2 )" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86" IUSE="selinux" -DEPEND="selinux? ( sys-libs/libselinux )" +DEPEND="virtual/libc + selinux? ( sys-libs/libselinux )" src_unpack () { unpack ${A} @@ -43,18 +44,17 @@ src_compile() { } src_install() { - dodir /lib /usr/include/pwdb + dodir /$(get_libdir) /usr/$(get_libdir) /usr/include/pwdb make \ INCLUDED=${D}/usr/include/pwdb \ - LIBDIR=${D}/lib \ + LIBDIR=${D}/$(get_libdir) \ LDCONFIG="echo" \ install || die preplib / - dodir /usr/lib - mv ${D}/lib/*.a ${D}/usr/lib + mv ${D}/$(get_libdir)/*.a ${D}/usr/$(get_libdir) - # See bug $4411 for more info + # See bug #4411 for more info gen_usr_ldscript libpwdb.so insinto /etc |