diff options
author | Christian Parpart <trapni@gentoo.org> | 2005-04-09 21:55:46 +0000 |
---|---|---|
committer | Christian Parpart <trapni@gentoo.org> | 2005-04-09 21:55:46 +0000 |
commit | c62fb3440993ac7c4a516e5fb41e1b9d131834f7 (patch) | |
tree | 29e02c967c6e4423cca349333cccd5b55864e312 /net-www | |
parent | Marked 0.94-r1 stable (x86). Removing old ebuild. (diff) | |
download | historical-c62fb3440993ac7c4a516e5fb41e1b9d131834f7.tar.gz historical-c62fb3440993ac7c4a516e5fb41e1b9d131834f7.tar.bz2 historical-c62fb3440993ac7c4a516e5fb41e1b9d131834f7.zip |
adding blocks to apr and apr-util for obsolete apache1 ebuilds as well, so, that users wanting to upgrade are enforced to unmerge their old apache before they emerge the newer versions
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'net-www')
-rw-r--r-- | net-www/apache/ChangeLog | 10 | ||||
-rw-r--r-- | net-www/apache/Manifest | 20 | ||||
-rw-r--r-- | net-www/apache/apache-1.3.29-r2.ebuild | 7 | ||||
-rw-r--r-- | net-www/apache/apache-1.3.31-r1.ebuild | 7 | ||||
-rw-r--r-- | net-www/apache/apache-1.3.31-r2.ebuild | 7 | ||||
-rw-r--r-- | net-www/apache/apache-1.3.31-r3.ebuild | 7 | ||||
-rw-r--r-- | net-www/apache/apache-1.3.31.ebuild | 7 | ||||
-rw-r--r-- | net-www/apache/apache-1.3.32-r1.ebuild | 7 | ||||
-rw-r--r-- | net-www/apache/apache-1.3.32.ebuild | 7 | ||||
-rw-r--r-- | net-www/apache/apache-1.3.33-r1.ebuild | 6 | ||||
-rw-r--r-- | net-www/apache/apache-1.3.33.ebuild | 6 |
11 files changed, 62 insertions, 29 deletions
diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog index 55135eed55ae..ddd9de12c67b 100644 --- a/net-www/apache/ChangeLog +++ b/net-www/apache/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-www/apache # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.338 2005/04/09 21:46:40 trapni Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.339 2005/04/09 21:55:46 trapni Exp $ + + 09 Apr 2005; Christian Parpart <trapni@gentoo.org> + apache-1.3.29-r2.ebuild, apache-1.3.31.ebuild, apache-1.3.31-r1.ebuild, + apache-1.3.31-r2.ebuild, apache-1.3.31-r3.ebuild, apache-1.3.32.ebuild, + apache-1.3.32-r1.ebuild, apache-1.3.33.ebuild, apache-1.3.33-r1.ebuild: + adding blocks to apr and apr-util for obsolete apache1 ebuilds as well, so, + that users wanting to upgrade are enforced to unmerge their old apache + before they emerge the newer versions 09 Apr 2005; Christian Parpart <trapni@gentoo.org> apache-2.0.50.ebuild, apache-2.0.51.ebuild, apache-2.0.51-r1.ebuild, apache-2.0.52.ebuild, diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest index a3c73a3a4dc3..252ae1130bb4 100644 --- a/net-www/apache/Manifest +++ b/net-www/apache/Manifest @@ -1,20 +1,20 @@ MD5 87f275604ba94e40c3f9238d308b2d80 apache-2.0.51.ebuild 12846 -MD5 3a3c425126f2c807be687471ee586e99 apache-1.3.31-r1.ebuild 6767 +MD5 d2794a4d623366ae015307911b5f5a1f apache-1.3.31-r1.ebuild 6806 MD5 3dfa66eb87e3230e7059605fe9d06cf0 apache-2.0.50.ebuild 12919 -MD5 db0afdd5255ad831638131ef69ff2267 apache-1.3.33.ebuild 6879 +MD5 defa6b47125809551de21814b2ccf0e6 apache-1.3.33.ebuild 6917 MD5 6d54155546bf789a16a9627b517c2c2e apache-2.0.52.ebuild 12849 MD5 28d2832713864257d005780be669f927 apache-2.0.52-r2.ebuild 12308 -MD5 b7525d11655917b0b16d46c26812b567 ChangeLog 57757 +MD5 42738075340812e0f781598806072be3 ChangeLog 58224 MD5 aa97e52247ade47afe6744b06960f728 apache-2.0.52-r3.ebuild 12045 -MD5 90e70419bec385aee16b10303e9235d3 apache-1.3.29-r2.ebuild 7158 -MD5 f7c1d7b06e45c35cd6608a8e10812277 apache-1.3.31-r2.ebuild 6892 -MD5 6e814f5e5b55cde00d31d77dbd2ba451 apache-1.3.33-r1.ebuild 6907 -MD5 15170badcb6a28012cc4d1e3bfddc126 apache-1.3.32.ebuild 6644 +MD5 5ef74d0ec62cc9aa553b19c89ba898e7 apache-1.3.29-r2.ebuild 7197 +MD5 26aeecc4289a4d8982052af3d229704a apache-1.3.31-r2.ebuild 6931 +MD5 07b63cfe387b4a9291a7989eaafccc46 apache-1.3.33-r1.ebuild 6942 +MD5 b46e4e143cdd5a3b8771324939cc8d0a apache-1.3.32.ebuild 6683 MD5 713aa03c3c91e341fca50297296712ad apache-1.3.33-r2.ebuild 8620 MD5 e265b8c0426359efe22f6c29d7e9be82 apache-2.0.53.ebuild 11915 -MD5 38f354f2c6d004534fc7a506209c1b3d apache-1.3.32-r1.ebuild 6636 -MD5 6f736bb02fa0e38438e74782d223293d apache-1.3.31-r3.ebuild 6900 -MD5 30eae150ac83b20287102122c37b580a apache-1.3.31.ebuild 6721 +MD5 534bbe01d74bdb592e4570db0cd45807 apache-1.3.32-r1.ebuild 6675 +MD5 ad0e486b5b081bb326450bf883f7363b apache-1.3.31-r3.ebuild 6939 +MD5 4972651d68219ad15fc821feda90d440 apache-1.3.31.ebuild 6760 MD5 0ad54f9bca6df15503afd06d5ced3c9a apache-2.0.52-r1.ebuild 13170 MD5 a419841198cd6a94b9dcf2e07f3c15b7 metadata.xml 617 MD5 83b0135a7c76f7689bf2ffebe147af5f apache-2.0.51-r1.ebuild 12854 diff --git a/net-www/apache/apache-1.3.29-r2.ebuild b/net-www/apache/apache-1.3.29-r2.ebuild index d308003314b3..81a5c577892f 100644 --- a/net-www/apache/apache-1.3.29-r2.ebuild +++ b/net-www/apache/apache-1.3.29-r2.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/net-www/apache/apache-1.3.29-r2.ebuild,v 1.8 2005/03/20 16:40:29 beu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.29-r2.ebuild,v 1.9 2005/04/09 21:55:46 trapni Exp $ inherit eutils fixheadtails @@ -25,7 +25,10 @@ DEPEND="dev-lang/perl >=dev-libs/mm-1.1.3 >=sys-libs/gdbm-1.8 >=dev-libs/expat-1.95.2 - selinux? ( sec-policy/selinux-apache )" + selinux? ( sec-policy/selinux-apache ) + !dev-libs/apr + !dev-libs/apr-util" + LICENSE="Apache-1.1" SLOT="1" diff --git a/net-www/apache/apache-1.3.31-r1.ebuild b/net-www/apache/apache-1.3.31-r1.ebuild index 0b189844965e..23ba5f635b24 100644 --- a/net-www/apache/apache-1.3.31-r1.ebuild +++ b/net-www/apache/apache-1.3.31-r1.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/net-www/apache/apache-1.3.31-r1.ebuild,v 1.15 2005/03/20 16:40:29 beu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.31-r1.ebuild,v 1.16 2005/04/09 21:55:46 trapni Exp $ inherit eutils fixheadtails @@ -24,7 +24,10 @@ DEPEND="dev-lang/perl >=sys-libs/gdbm-1.8 >=dev-libs/expat-1.95.2 =sys-libs/db-1* - selinux? ( sec-policy/selinux-apache )" + selinux? ( sec-policy/selinux-apache ) + !dev-libs/apr + !dev-libs/apr-util" + LICENSE="Apache-2.0" SLOT="1" diff --git a/net-www/apache/apache-1.3.31-r2.ebuild b/net-www/apache/apache-1.3.31-r2.ebuild index 771e455b0694..76029513b220 100644 --- a/net-www/apache/apache-1.3.31-r2.ebuild +++ b/net-www/apache/apache-1.3.31-r2.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/net-www/apache/apache-1.3.31-r2.ebuild,v 1.15 2005/03/20 16:40:29 beu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.31-r2.ebuild,v 1.16 2005/04/09 21:55:46 trapni Exp $ inherit eutils fixheadtails @@ -25,7 +25,10 @@ DEPEND="dev-lang/perl >=sys-libs/gdbm-1.8 >=dev-libs/expat-1.95.2 =sys-libs/db-1* - selinux? ( sec-policy/selinux-apache )" + selinux? ( sec-policy/selinux-apache ) + !dev-libs/apr + !dev-libs/apr-util" + LICENSE="Apache-2.0" SLOT="1" diff --git a/net-www/apache/apache-1.3.31-r3.ebuild b/net-www/apache/apache-1.3.31-r3.ebuild index b6a749c3d8f8..0991bf03310c 100644 --- a/net-www/apache/apache-1.3.31-r3.ebuild +++ b/net-www/apache/apache-1.3.31-r3.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/net-www/apache/apache-1.3.31-r3.ebuild,v 1.13 2005/03/20 16:40:29 beu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.31-r3.ebuild,v 1.14 2005/04/09 21:55:46 trapni Exp $ inherit eutils fixheadtails @@ -25,7 +25,10 @@ DEPEND="dev-lang/perl >=sys-libs/gdbm-1.8 >=dev-libs/expat-1.95.2 =sys-libs/db-1* - selinux? ( sec-policy/selinux-apache )" + selinux? ( sec-policy/selinux-apache ) + !dev-libs/apr + !dev-libs/apr-util" + LICENSE="Apache-2.0" SLOT="1" diff --git a/net-www/apache/apache-1.3.31.ebuild b/net-www/apache/apache-1.3.31.ebuild index ca226daf10b5..fd1933c0741a 100644 --- a/net-www/apache/apache-1.3.31.ebuild +++ b/net-www/apache/apache-1.3.31.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/net-www/apache/apache-1.3.31.ebuild,v 1.17 2005/03/20 16:40:29 beu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.31.ebuild,v 1.18 2005/04/09 21:55:46 trapni Exp $ inherit eutils fixheadtails @@ -23,7 +23,10 @@ DEPEND="dev-lang/perl >=dev-libs/mm-1.1.3 >=sys-libs/gdbm-1.8 >=dev-libs/expat-1.95.2 - =sys-libs/db-1*" + =sys-libs/db-1* + !dev-libs/apr + !dev-libs/apr-util" + LICENSE="Apache-2.0" SLOT="1" diff --git a/net-www/apache/apache-1.3.32-r1.ebuild b/net-www/apache/apache-1.3.32-r1.ebuild index 032f3953e6eb..9e7a1fa3ab14 100644 --- a/net-www/apache/apache-1.3.32-r1.ebuild +++ b/net-www/apache/apache-1.3.32-r1.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/net-www/apache/apache-1.3.32-r1.ebuild,v 1.10 2005/03/20 16:40:29 beu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.32-r1.ebuild,v 1.11 2005/04/09 21:55:46 trapni Exp $ inherit eutils fixheadtails @@ -25,7 +25,10 @@ DEPEND="dev-lang/perl >=sys-libs/gdbm-1.8 >=dev-libs/expat-1.95.2 =sys-libs/db-1* - selinux? ( sec-policy/selinux-apache )" + selinux? ( sec-policy/selinux-apache ) + !dev-libs/apr + !dev-libs/apr-util" + LICENSE="Apache-2.0" SLOT="1" diff --git a/net-www/apache/apache-1.3.32.ebuild b/net-www/apache/apache-1.3.32.ebuild index c26d821fbf12..ab16f89f03ef 100644 --- a/net-www/apache/apache-1.3.32.ebuild +++ b/net-www/apache/apache-1.3.32.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/net-www/apache/apache-1.3.32.ebuild,v 1.3 2005/03/20 16:40:29 beu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.32.ebuild,v 1.4 2005/04/09 21:55:46 trapni Exp $ inherit eutils fixheadtails @@ -25,7 +25,10 @@ DEPEND="dev-lang/perl >=sys-libs/gdbm-1.8 >=dev-libs/expat-1.95.2 =sys-libs/db-1* - selinux? ( sec-policy/selinux-apache )" + selinux? ( sec-policy/selinux-apache ) + !dev-libs/apr + !dev-libs/apr-util" + LICENSE="Apache-2.0" SLOT="1" diff --git a/net-www/apache/apache-1.3.33-r1.ebuild b/net-www/apache/apache-1.3.33-r1.ebuild index 1d3e68bef1f7..0b6ebefea3d0 100644 --- a/net-www/apache/apache-1.3.33-r1.ebuild +++ b/net-www/apache/apache-1.3.33-r1.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/net-www/apache/apache-1.3.33-r1.ebuild,v 1.18 2005/04/09 15:39:28 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.33-r1.ebuild,v 1.19 2005/04/09 21:55:46 trapni Exp $ # Gentoo ARCH teams # @@ -35,7 +35,9 @@ DEPEND="dev-lang/perl >=sys-libs/gdbm-1.8 >=dev-libs/expat-1.95.2 =sys-libs/db-1* - selinux? ( sec-policy/selinux-apache )" + selinux? ( sec-policy/selinux-apache ) + !dev-libs/apr + !dev-libs/apr-util" PDEPEND="ssl? ( =net-www/mod_ssl-${mod_ssl_dep} )" diff --git a/net-www/apache/apache-1.3.33.ebuild b/net-www/apache/apache-1.3.33.ebuild index 32d4e0cc3957..ac972f8ce681 100644 --- a/net-www/apache/apache-1.3.33.ebuild +++ b/net-www/apache/apache-1.3.33.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/net-www/apache/apache-1.3.33.ebuild,v 1.12 2005/03/20 16:40:29 beu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.33.ebuild,v 1.13 2005/04/09 21:55:46 trapni Exp $ # Gentoo ARCH teams # @@ -35,7 +35,9 @@ DEPEND="dev-lang/perl >=sys-libs/gdbm-1.8 >=dev-libs/expat-1.95.2 =sys-libs/db-1* - selinux? ( sec-policy/selinux-apache )" + selinux? ( sec-policy/selinux-apache ) + !dev-libs/apr + !dev-libs/apr-util" PDEPEND="ssl? ( =net-www/mod_ssl-${mod_ssl_dep} )" |