summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Duft <mduft@gentoo.org>2009-01-19 10:22:05 +0000
committerMarkus Duft <mduft@gentoo.org>2009-01-19 10:22:05 +0000
commit293e2334bd14aec898d12cd5bdaf04710ef31fa9 (patch)
tree06be3fc0dc8d858b405872b209e2ce9579d52099 /app-arch/bzip2
parentfixed for and keyworded ~x86-winnt (diff)
downloadprefix-293e2334bd14aec898d12cd5bdaf04710ef31fa9.tar.gz
prefix-293e2334bd14aec898d12cd5bdaf04710ef31fa9.tar.bz2
prefix-293e2334bd14aec898d12cd5bdaf04710ef31fa9.zip
fixed for and keyworded ~x86-winnt
(Portage version: 2.2.00.12425-prefix/svn/Interix 6.0 x86)
Diffstat (limited to 'app-arch/bzip2')
-rw-r--r--app-arch/bzip2/Manifest2
-rw-r--r--app-arch/bzip2/bzip2-1.0.5-r1.ebuild9
2 files changed, 9 insertions, 2 deletions
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 3ed7c3bda1..3873da2d8a 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -13,6 +13,6 @@ AUX bzip2-1.0.5-checkenv.patch 823 RMD160 1d5580a49a167b8c266631ce5f27d43835f47b
AUX bzip2-1.0.5-soldflags.patch 640 RMD160 a363249ec90fd9f92acc8054b9f5a192235a9f99 SHA1 978ca6f575a67792d3264d3b7ba91b5844342c1d SHA256 9d90dd642c0e73d054f99cf10d47e104011a253aaeac82cedef098eb7f78f064
DIST bzip2-1.0.5.tar.gz 841402 RMD160 2b31a22138e3914d82a656fee28e2bf029cbc3d4 SHA1 8b02713ea0c8eb501cc8bdac4432d7f29700f767 SHA256 f7bf5368309d76e5daf3a89d4d1bea688dac7780742e7a0ae1af19be9316fe22
EBUILD bzip2-1.0.5-r00.1.ebuild 3533 RMD160 b80cca2e7934e4de58c6d599c9a374b0e1a86180 SHA1 ef833f2061fbf33676c5181574d5793a164d6f52 SHA256 e424507f3459a33624515bf9e5f9ac8c8cf10dcd7065ed3976ace9bc4c5207b5
-EBUILD bzip2-1.0.5-r1.ebuild 3700 RMD160 b2504265927914e04d50f432b82536e7501b7adc SHA1 10a20ba42fc45f0221b8935980a35d082096c92c SHA256 8b8081c2ec59b96c13ffdfe55a763eaef9325c13b6b1e5b9387b470e2ae9280e
+EBUILD bzip2-1.0.5-r1.ebuild 3972 RMD160 77be76cd472cc15ecb80d6940d0840aa2c5ddc23 SHA1 af06cb4f5d9434c9090714594a7221e1db97b0f8 SHA256 b4d3007a44c58820f1f45983cbeab9b68ec25ad356787c4724403f88c9a823a8
MISC ChangeLog 12151 RMD160 70f6481ae6e2a03b8cb45ca1f2cfeda66b64f09a SHA1 577b4762d04ce4a7962fde17a221bf7dd8d0917b SHA256 cd4d4813d651c6d1a8176c502693ab83deb745aabce319101128a4be8410e167
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/app-arch/bzip2/bzip2-1.0.5-r1.ebuild b/app-arch/bzip2/bzip2-1.0.5-r1.ebuild
index 2715aa4b91..d48cb95612 100644
--- a/app-arch/bzip2/bzip2-1.0.5-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz"
LICENSE="BZIP2"
SLOT="0"
-KEYWORDS="~ppc-aix ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~ppc-aix ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="static"
DEPEND=""
@@ -101,6 +101,13 @@ src_install() {
fi
dolib.so libbz2$(get_libname ${PV}) || die "dolib shared"
+ if [[ ${CHOST} == *-winnt* ]]; then
+ dolib.so libbz2$(get_libname ${PV}).dll || die "dolib shared"
+
+ # on windows, we want to continue using bzip2 from interix.
+ # building bzip2 on windows gives the libraries only!
+ rm -rf "${ED}"/bin "${ED}"/usr/bin
+ fi
for v in libbz2$(get_libname) libbz2$(get_libname ${PV%%.*}) libbz2$(get_libname ${PV%.*}) ; do
[[ libbz2$(get_libname ${PV}) != ${v} ]] &&
dosym libbz2$(get_libname ${PV}) /$(get_libdir)/${v}