'example' USE-flag added & license corrected: bug #33106

Package-Manager: portage-2.1.2_rc1-r5

4 files changed, 29 insertions, 19 deletions

diff --git a/dev-cpp/libpqpp/ChangeLog b/dev-cpp/libpqpp/ChangeLog
index 821da4f587a4..e8e43c8cebe7 100644
--- a/dev-cpp/libpqpp/ChangeLog
+++ b/dev-cpp/libpqpp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/libpqpp
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpqpp/ChangeLog,v 1.16 2006/11/09 15:24:08 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpqpp/ChangeLog,v 1.17 2006/11/11 02:19:53 dev-zero Exp $
+
+  11 Nov 2006; Tiziano Müller <dev-zero@gentoo.org> libpqpp-4.0-r4.ebuild,
+  libpqpp-4.0-r6.ebuild:
+  'example' USE-flag added & license corrected: bug #33106
 
   09 Nov 2006; Tiziano Müller <dev-zero@gentoo.org> -libpqpp-4.0-r5.ebuild,
   libpqpp-4.0-r6.ebuild:
diff --git a/dev-cpp/libpqpp/Manifest b/dev-cpp/libpqpp/Manifest
index 0a65ec11e450..d5342fd7640f 100644
--- a/dev-cpp/libpqpp/Manifest
+++ b/dev-cpp/libpqpp/Manifest
@@ -11,18 +11,18 @@ MD5 530daffcb76569636aa08cb163318b88 files/libpqpp-4.0-gentoo.patch 3559
 RMD160 020f7392ef111d2829235a16baef9fb5f66c42d4 files/libpqpp-4.0-gentoo.patch 3559
 SHA256 27503b901b0124aac1b843344657703febee0a4886e0a55c20a6a0b5fc5bf018 files/libpqpp-4.0-gentoo.patch 3559
 DIST libpq++-4.0.tar.gz 25809 RMD160 f56657e7575f66454b2a6aa818b3ee58fa22cbaa SHA1 f58e570257a40cec94f48221de469ca5bf9224f4 SHA256 3a5a6ed9eac9477b20bf64b61e2f8bfb6f27a602a6093212a4a247d44715eb03
-EBUILD libpqpp-4.0-r4.ebuild 1210 RMD160 1d3f8f08afa9fb9a0cc9b8b962de767d22508566 SHA1 ce2e80380600dcab4a4785e4b9fb3e19811fbc67 SHA256 93480d2a2e4af918ad81002935cc70446a6df4d0f5b58816db892eb6ff34d861
-MD5 b2adc3145af4fc65e56e4907c4467a44 libpqpp-4.0-r4.ebuild 1210
-RMD160 1d3f8f08afa9fb9a0cc9b8b962de767d22508566 libpqpp-4.0-r4.ebuild 1210
-SHA256 93480d2a2e4af918ad81002935cc70446a6df4d0f5b58816db892eb6ff34d861 libpqpp-4.0-r4.ebuild 1210
-EBUILD libpqpp-4.0-r6.ebuild 942 RMD160 92073e1bffa188dac1314080c55009a6b0c88b78 SHA1 1442c4760e8191f365a8046c731797febc2943d5 SHA256 ee1c3ebcb071fd46db5adcfbcc6f57dad715c1736223c8aca9707cee7266a455
-MD5 a61701903fd1dbae855d3e07ae863b73 libpqpp-4.0-r6.ebuild 942
-RMD160 92073e1bffa188dac1314080c55009a6b0c88b78 libpqpp-4.0-r6.ebuild 942
-SHA256 ee1c3ebcb071fd46db5adcfbcc6f57dad715c1736223c8aca9707cee7266a455 libpqpp-4.0-r6.ebuild 942
-MISC ChangeLog 2609 RMD160 ec00941fc3ed7be695b9c7bd554db96676901e45 SHA1 5a07ae758939212707efbddbd3584ccdb77d3db3 SHA256 0abfdb1d5c6f8e4b7693ecad2ca84d3b41d166071f5384a5f4ea9ad6864cbc5e
-MD5 d458bb6f88bb2a7006c6318d412ff309 ChangeLog 2609
-RMD160 ec00941fc3ed7be695b9c7bd554db96676901e45 ChangeLog 2609
-SHA256 0abfdb1d5c6f8e4b7693ecad2ca84d3b41d166071f5384a5f4ea9ad6864cbc5e ChangeLog 2609
+EBUILD libpqpp-4.0-r4.ebuild 1203 RMD160 cf3c14d638a6701535fd0420c7929dfa8b6d2c08 SHA1 3f508024f4332c85f404761a73fc13b8ce1cbd4b SHA256 ff78a03eedaadae417a2be9e9ef047212707a4c8700a85d8e37f1fbb51225aae
+MD5 ca1ef0d3db64f3aa1ecd94456b9fd623 libpqpp-4.0-r4.ebuild 1203
+RMD160 cf3c14d638a6701535fd0420c7929dfa8b6d2c08 libpqpp-4.0-r4.ebuild 1203
+SHA256 ff78a03eedaadae417a2be9e9ef047212707a4c8700a85d8e37f1fbb51225aae libpqpp-4.0-r4.ebuild 1203
+EBUILD libpqpp-4.0-r6.ebuild 1073 RMD160 791f7c25ac617b397cbb3563c354a3489fe7c576 SHA1 2d311f71adb1625a34facb2ae25ac40c7cef8695 SHA256 67a37bd0801c81c5644e530787c950f873f93ddc2fdb5ae624336f862cc31ed2
+MD5 12c1a0110efe1efaba0bd4ae4764a883 libpqpp-4.0-r6.ebuild 1073
+RMD160 791f7c25ac617b397cbb3563c354a3489fe7c576 libpqpp-4.0-r6.ebuild 1073
+SHA256 67a37bd0801c81c5644e530787c950f873f93ddc2fdb5ae624336f862cc31ed2 libpqpp-4.0-r6.ebuild 1073
+MISC ChangeLog 2770 RMD160 eb63045ae19c75856b2e117514767a3ac608e121 SHA1 3bb1c6325fa068b68423a7cf07322d4af0fbf861 SHA256 19f7f28a51f936a14bc23b1aa5bcd1e31be5f4fa4bb0378e8f347fadbdde18eb
+MD5 43d04a4e30ce7106b3eb5d46611eb5b9 ChangeLog 2770
+RMD160 eb63045ae19c75856b2e117514767a3ac608e121 ChangeLog 2770
+SHA256 19f7f28a51f936a14bc23b1aa5bcd1e31be5f4fa4bb0378e8f347fadbdde18eb ChangeLog 2770
 MISC metadata.xml 163 RMD160 70bbda1c1e8316a09d467334131898ae833a3205 SHA1 f43b9a4a2a82140936f9b04e4e63b3c9a495141f SHA256 f0699a4c3ad24cc38836c2d4a1ba03e4e403a9a5364b51df405db02014005891
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
 RMD160 70bbda1c1e8316a09d467334131898ae833a3205 metadata.xml 163
diff --git a/dev-cpp/libpqpp/libpqpp-4.0-r4.ebuild b/dev-cpp/libpqpp/libpqpp-4.0-r4.ebuild
index 644a0890a377..28fb3b811e36 100644
--- a/dev-cpp/libpqpp/libpqpp-4.0-r4.ebuild
+++ b/dev-cpp/libpqpp/libpqpp-4.0-r4.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-cpp/libpqpp/libpqpp-4.0-r4.ebuild,v 1.10 2005/04/13 20:05:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpqpp/libpqpp-4.0-r4.ebuild,v 1.11 2006/11/11 02:19:53 dev-zero Exp $
 
 inherit eutils
 IUSE=""
@@ -8,7 +8,7 @@ MY_P=${P/pp/++}
 DESCRIPTION="C++ wrapper for the libpq Postgresql library"
 HOMEPAGE="http://gborg.postgresql.org/"
 SRC_URI="ftp://gborg.postgresql.org/pub/libpqpp/stable/${MY_P}.tar.gz"
-LICENSE="LGPL-2.1"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="sparc x86"
 
diff --git a/dev-cpp/libpqpp/libpqpp-4.0-r6.ebuild b/dev-cpp/libpqpp/libpqpp-4.0-r6.ebuild
index 772affcb1990..b2dcff4578c5 100644
--- a/dev-cpp/libpqpp/libpqpp-4.0-r6.ebuild
+++ b/dev-cpp/libpqpp/libpqpp-4.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpqpp/libpqpp-4.0-r6.ebuild,v 1.3 2006/11/09 15:24:08 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libpqpp/libpqpp-4.0-r6.ebuild,v 1.4 2006/11/11 02:19:53 dev-zero Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -11,9 +11,9 @@ MY_P=${P/pp/++}
 DESCRIPTION="C++ wrapper for the libpq Postgresql library"
 HOMEPAGE="http://gborg.postgresql.org/"
 SRC_URI="ftp://gborg.postgresql.org/pub/libpqpp/stable/${MY_P}.tar.gz"
-LICENSE="LGPL-2.1"
+LICENSE="BSD"
 SLOT="0"
-IUSE=""
+IUSE="examples"
 
 DEPEND="dev-db/libpq"
 RDEPEND="${DEPEND}"
@@ -34,4 +34,10 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install || die "emake install failed"
 	dodoc README CHANGES
+	dohtml docs/*.html
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/{Makefile,*.{cc,sql}}
+	fi
 }