diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-06-19 18:50:43 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-06-19 18:50:43 +0000 |
commit | d92ec07a351487f0728bf9f6fdbbef594e0f5504 (patch) | |
tree | 17119a320f03bd8306427fd696787cbc7adeb69c /dev-db | |
parent | Pull in makedev again #368597. (diff) | |
download | historical-d92ec07a351487f0728bf9f6fdbbef594e0f5504.tar.gz historical-d92ec07a351487f0728bf9f6fdbbef594e0f5504.tar.bz2 historical-d92ec07a351487f0728bf9f6fdbbef594e0f5504.zip |
Sync live and release ebuild. Bump to 3.0.4. Remove older.
Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/pgpool2/ChangeLog | 8 | ||||
-rw-r--r-- | dev-db/pgpool2/Manifest | 14 | ||||
-rw-r--r-- | dev-db/pgpool2/pgpool2-3.0.4.ebuild (renamed from dev-db/pgpool2/pgpool2-3.0.3-r1.ebuild) | 39 | ||||
-rw-r--r-- | dev-db/pgpool2/pgpool2-9999.ebuild | 34 |
4 files changed, 55 insertions, 40 deletions
diff --git a/dev-db/pgpool2/ChangeLog b/dev-db/pgpool2/ChangeLog index 291f29f9c1c3..9a6401b34797 100644 --- a/dev-db/pgpool2/ChangeLog +++ b/dev-db/pgpool2/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-db/pgpool2 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/ChangeLog,v 1.7 2011/05/19 15:34:36 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/ChangeLog,v 1.8 2011/06/19 18:50:43 scarabeus Exp $ + +*pgpool2-3.0.4 (19 Jun 2011) + + 19 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> + -pgpool2-3.0.3-r1.ebuild, +pgpool2-3.0.4.ebuild, pgpool2-9999.ebuild: + Sync live and release ebuild. Bump to 3.0.4. Remove older. 19 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> -pgpool2-3.0.3.ebuild: remove old diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest index 034e8f1f4dc7..2a48399e6ef1 100644 --- a/dev-db/pgpool2/Manifest +++ b/dev-db/pgpool2/Manifest @@ -2,15 +2,15 @@ Hash: SHA1 AUX pgpool2.initd 625 RMD160 c19f8bb11c2a6f353f1aae65d1a6452e6a301d52 SHA1 d45254f3972df9fead5d85f76be399b771a3237a SHA256 65d00f07f7c14f78c8a4f41c49ef5d9542796ea2278e74c022b93dd7d6ff60fc -DIST pgpool-II-3.0.3.tar.gz 1202898 RMD160 06643c78de389777d378f13b6c9667eeee2d6cb2 SHA1 3b28e04a7dd664bf0b8fd2be58e99465bdc39c13 SHA256 46384b14b6690fcaddd472de8bbeb03f901eeb9f3303386a932016b5c28bc9fe -EBUILD pgpool2-3.0.3-r1.ebuild 1496 RMD160 a034bcce5f3b8d949e65cac2759e517dbe2cdb1b SHA1 d7d3b6c80aa6c9c50fadf86d910865bab635abed SHA256 cb4c6e7f76367cfa6c6fd661c4ab1bf520d53085b95e491bfb35bbd29b5023be -EBUILD pgpool2-9999.ebuild 1468 RMD160 c210aebfea112e47eeabc2da6eabc17effc237de SHA1 9baa4771211e12eb37e67dd029fa5fd51728d0d1 SHA256 deb27d9a4b9ad8accba36994e33c3c121cb14f2a6a37ec5ee32911d11efb59ad -MISC ChangeLog 1463 RMD160 e7940a729599f24db2d80fd63b8421563f66894e SHA1 2d5945fb5b8701a79c7f83b8288df7a9fcb94b83 SHA256 7c3eca9844ca1bc67129aeabc81695cc94376e00d2f83264398d8a8f28df95c0 +DIST pgpool-II-3.0.4.tar.gz 1211828 RMD160 51572b55e7e7ac1d67269ac2c45a1b8316314fa4 SHA1 dfbc5d8e05f79bbf96725204a0291955194e96d0 SHA256 886e0fa3dec98f4a6c25cc5b4b1fc5aac49258e2669c1ffda178d18711c8b5c1 +EBUILD pgpool2-3.0.4.ebuild 1669 RMD160 c19e5b42ae544a154e89da15c1e96f24fea554be SHA1 18386aa56c054aa74624990eaa9506437369283d SHA256 e0dbdb6f5b3c1799506fa4d46a9dc71880a4e84d86a91c2b87c8c08ce0e67a1c +EBUILD pgpool2-9999.ebuild 1668 RMD160 b892d1994a7091efb91ee55a4f4031bfe051b8a9 SHA1 98c61701a9ac59f081177d54028362ef299bc8f5 SHA256 e8570c39ef49f000ebd4a4dee575896dc55448e6103e9eb67427e59dad2f8997 +MISC ChangeLog 1682 RMD160 fdc3468cbd27d48761d56f2cd38adaad9910e7d8 SHA1 019c8baa12405e082ab8065f75e7da59a592cdc3 SHA256 fd46466619c9d048f7ec5886f6db04c700899ec024e9f3d407ac3efd4c8bc2fd MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk3VOJEACgkQHB6c3gNBRYfsagCeP89tBE5ZjGqmwe3OAY8Vh6Yc -9awAn2ulV/HxZGkX8y+VQFDMqRGQxErO -=s6ZR +iEYEARECAAYFAk3+RNYACgkQHB6c3gNBRYdVlACgrQfZxxZA1SVKVxt4XiCq2w36 +8b4AnRarG9wAmYbsr2PXBUD7U9nCbUE9 +=gwzi -----END PGP SIGNATURE----- diff --git a/dev-db/pgpool2/pgpool2-3.0.3-r1.ebuild b/dev-db/pgpool2/pgpool2-3.0.4.ebuild index 5606fe67e388..e177bbebc1b6 100644 --- a/dev-db/pgpool2/pgpool2-3.0.3-r1.ebuild +++ b/dev-db/pgpool2/pgpool2-3.0.4.ebuild @@ -1,18 +1,24 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-3.0.3-r1.ebuild,v 1.1 2011/04/17 14:00:57 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-3.0.4.ebuild,v 1.1 2011/06/19 18:50:43 scarabeus Exp $ EAPI=4 -MY_P="${PN/2/-II}-${PV}" -inherit autotools-utils autotools +[[ ${PV} == 9999 ]] && MY_P=${PN/2/-II} || MY_P="${PN/2/-II}-${PV}" + +ECVS_SERVER="cvs.pgfoundry.org:/cvsroot/pgpool" +ECVS_MODULE="pgpool-II" +[[ ${PV} == 9999 ]] && SCM_ECLASS="cvs" +inherit base autotools ${SCM_ECLASS} +unset SCM_ECLASS DESCRIPTION="Connection pool server for PostgreSQL" HOMEPAGE="http://pgpool.projects.postgresql.org/" -SRC_URI="http://pgfoundry.org/frs/download.php/2958/${MY_P}.tar.gz" +[[ ${PV} == 9999 ]] || SRC_URI="http://pgfoundry.org/frs/download.php/3076/${MY_P}.tar.gz" + LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86" IUSE="pam ssl static-libs" RDEPEND=" @@ -32,11 +38,12 @@ DOCS=( "doc/where_to_send_queries.pdf" ) HTML_DOCS=( - "doc/pgpool-en.html" "doc/pgpool.css" + "doc/pgpool-en.html" + "doc/pgpool.css" "doc/tutorial-en.html" ) -S="${WORKDIR}/${MY_P}" +S=${WORKDIR}/${MY_P} src_prepare() { sed -i \ @@ -45,24 +52,22 @@ src_prepare() { sed -i \ -e '/ACLOCAL_AMFLAGS/ d' \ Makefile.am || die - autotools-utils_src_prepare + base_src_prepare eautoreconf } src_configure() { - local myeconfargs=( - "--sysconfdir=${EROOT}/etc/${PN}" - "--disable-dependency-tracking" - "--disable-rpath" - $(use_with ssl openssl) + econf \ + --sysconfdir=${EROOT}/etc/${PN} \ + --disable-rpath \ + $(use_enable static-libs static) \ + $(use_with ssl openssl) \ $(use_with pam) - ) - autotools-utils_src_configure } src_install() { - autotools-utils_src_install - remove_libtool_files all + base_src_install + find "${ED}" -name '*.la' -exec rm -f {} + # move misc data to proper folder mv "${ED}/usr/share/${PN/2/-II}" "${ED}/usr/share/${PN}" || die diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild index 2964688e4840..c1d066d7f1fc 100644 --- a/dev-db/pgpool2/pgpool2-9999.ebuild +++ b/dev-db/pgpool2/pgpool2-9999.ebuild @@ -1,19 +1,24 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-9999.ebuild,v 1.2 2011/04/17 14:00:57 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-9999.ebuild,v 1.3 2011/06/19 18:50:43 scarabeus Exp $ EAPI=4 +[[ ${PV} == 9999 ]] && MY_P=${PN/2/-II} || MY_P="${PN/2/-II}-${PV}" + ECVS_SERVER="cvs.pgfoundry.org:/cvsroot/pgpool" ECVS_MODULE="pgpool-II" -inherit autotools-utils cvs autotools +[[ ${PV} == 9999 ]] && SCM_ECLASS="cvs" +inherit base autotools ${SCM_ECLASS} +unset SCM_ECLASS DESCRIPTION="Connection pool server for PostgreSQL" HOMEPAGE="http://pgpool.projects.postgresql.org/" +[[ ${PV} == 9999 ]] || SRC_URI="http://pgfoundry.org/frs/download.php/3076/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="" +[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86" IUSE="pam ssl static-libs" RDEPEND=" @@ -33,11 +38,12 @@ DOCS=( "doc/where_to_send_queries.pdf" ) HTML_DOCS=( - "doc/pgpool-en.html" "doc/pgpool.css" + "doc/pgpool-en.html" + "doc/pgpool.css" "doc/tutorial-en.html" ) -S="${WORKDIR}/pgpool-II/" +S=${WORKDIR}/${MY_P} src_prepare() { sed -i \ @@ -46,24 +52,22 @@ src_prepare() { sed -i \ -e '/ACLOCAL_AMFLAGS/ d' \ Makefile.am || die - autotools-utils_src_prepare + base_src_prepare eautoreconf } src_configure() { - local myeconfargs=( - "--sysconfdir=${EROOT}/etc/${PN}" - "--disable-dependency-tracking" - "--disable-rpath" - $(use_with ssl openssl) + econf \ + --sysconfdir=${EROOT}/etc/${PN} \ + --disable-rpath \ + $(use_enable static-libs static) \ + $(use_with ssl openssl) \ $(use_with pam) - ) - autotools-utils_src_configure } src_install() { - autotools-utils_src_install - remove_libtool_files all + base_src_install + find "${ED}" -name '*.la' -exec rm -f {} + # move misc data to proper folder mv "${ED}/usr/share/${PN/2/-II}" "${ED}/usr/share/${PN}" || die |