version bump reported by Bertrand Jacquin in bug #277870

Package-Manager: portage-2.2_rc36/cvs/Linux i686

4 files changed, 69 insertions, 114 deletions

diff --git a/media-gfx/openclipart/ChangeLog b/media-gfx/openclipart/ChangeLog
index 556643f6955b..8bbf883a99d0 100644
--- a/media-gfx/openclipart/ChangeLog
+++ b/media-gfx/openclipart/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/openclipart
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openclipart/ChangeLog,v 1.5 2009/07/19 13:27:23 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openclipart/ChangeLog,v 1.6 2009/08/08 10:37:03 maekke Exp $
+
+*openclipart-0.20 (08 Aug 2009)
+
+  08 Aug 2009; Markus Meier <maekke@gentoo.org> -openclipart-0.18-r1.ebuild,
+  +openclipart-0.20.ebuild:
+  version bump reported by Bertrand Jacquin in bug #277870
 
   19 Jul 2009; nixnut <nixnut@gentoo.org> openclipart-0.19.ebuild:
   ppc stable #272673
diff --git a/media-gfx/openclipart/Manifest b/media-gfx/openclipart/Manifest
index b4adf147eb41..c9a4b208557d 100644
--- a/media-gfx/openclipart/Manifest
+++ b/media-gfx/openclipart/Manifest
@@ -1,7 +1,16 @@
-DIST openclipart-0.18-full.tar.bz2 116472396 RMD160 438a387e2abd2fd6044282d2853747231206871f SHA1 97f8d53d0ee761009325105c1808fdc6b938cdf2 SHA256 446a1d4af2fd7f9e4664853c778ef321e1aa6518a76065aa9d912f5914509db4
-DIST openclipart-0.18-svgonly.tar.bz2 82108957 RMD160 cdd9855ba421d42f6e9d78e208e84dcf660a6cd0 SHA1 c9042d032142ddadc33f4f2a512c56016cae4f36 SHA256 57572d443439759b0347da95a5457f988048976c7e13d70a09894cdee412be29
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST openclipart-0.19.tar.bz2 340235637 RMD160 44ac6643880e0106d6b5b01401d3a7ba29e2103e SHA1 7a58138b445333f3281c048f2e4a85fc51fc9035 SHA256 1a88a6a9933b8a7d93008db3d0a7613d102fc2c4e4181170579a02057dbc8619
-EBUILD openclipart-0.18-r1.ebuild 2844 RMD160 a8a69f9c67a9c90497db2875f2ebae288e1e2486 SHA1 203f4affbf510dd62f3e1aae46c94896f2d19713 SHA256 c8e059a8c64927d05cfed44c9e3613d3731c98ea2bc2e68374eb8f0a2b7421c1
+DIST openclipart-0.20.tar.bz2 367385284 RMD160 535cd67ecdbebeef22f3a839d93f3a7438615a39 SHA1 d117c1789668d8f7e310cd75bb58202c91a848ed SHA256 6f1fc33b0149e755196882ecab083d56daa3ff6ed78823b36be01f40abc7eb87
 EBUILD openclipart-0.19.ebuild 1204 RMD160 115bd24a42c786dbca93d5fba3990f646596e113 SHA1 32147c2d7832903c05e800487bdb03c75ecc529b SHA256 abc84e0b9f35a66c3fdab130cfee4f5a2f2112d000e5de5b860c91a1897ba812
-MISC ChangeLog 3019 RMD160 c9d6fe2206da81d4d5d98521f9f8d44027503e56 SHA1 6ee946c03c3192064c8e4ddbe5a13270b7eff962 SHA256 7dc10d3e1e3977123fc5143f46b0f3979f06bbb7c7839a62fedc59fd6b48fb7f
+EBUILD openclipart-0.20.ebuild 1207 RMD160 70fc9f936e04cbb9f78638366f569d1b2c6f507b SHA1 597b3166304a59e311a08706e8a42f5aade3d1e7 SHA256 654f8bcda97a3bffc74ba1cb71fec8c71bfe6a560b9a19a108ee0d4c828a8fde
+MISC ChangeLog 3217 RMD160 75a5df74ad263883acfd976fd056498ba5fe70b1 SHA1 df479c649c8748d4e9ff9b7d826ac3b543692263 SHA256 3b87b57f4fd228c7411e97bc33f95f34c56a5907366e3863555af74a0edeafa2
 MISC metadata.xml 235 RMD160 500382c21b61543f3fb7cf2c84ed8ac29b9b2e65 SHA1 5082333c66da4becb52ea246f9148747fa98fbda SHA256 fc2c748e2b4e2b4d12f12ec66fadca4aec975101d2115078a44a6f43a76a72e5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkp9VckACgkQkKaRLQcq0GKbZQCfaI7wEngV+UmEJx3xapohHKnq
+koAAmQGgztJ3B+lAGV/TcwzbyugYZ1oq
+=V99U
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/openclipart/openclipart-0.18-r1.ebuild b/media-gfx/openclipart/openclipart-0.18-r1.ebuild
deleted file mode 100644
index eb5752a5b7ff..000000000000
--- a/media-gfx/openclipart/openclipart-0.18-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openclipart/openclipart-0.18-r1.ebuild,v 1.1 2009/06/03 02:17:30 ssuominen Exp $
-
-DESCRIPTION="Open Clip Art Library (openclipart.org)"
-HOMEPAGE="http://www.openclipart.org/"
-
-# Ugly stuff warning:
-SRC_URI="svg? ( !wmf? ( !png? ( !pdf? ( !doc? (
-			http://download.openclipart.org/downloads/${PV}/${P}-svgonly.tar.bz2
-		) ) ) )
-		png? ( http://download.openclipart.org/downloads/${PV}/${P}-full.tar.bz2 )
-		pdf? ( http://download.openclipart.org/downloads/${PV}/${P}-full.tar.bz2 )
-		wmf? ( http://download.openclipart.org/downloads/${PV}/${P}-full.tar.bz2 )
-		doc? ( http://download.openclipart.org/downloads/${PV}/${P}-full.tar.bz2 )
-	)
-	!svg? ( http://download.openclipart.org/downloads/${PV}/${P}-full.tar.bz2 )"
-
-LICENSE="public-domain" # creative commons
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc svg png pdf wmf gzip"
-
-# We don't really need anything to run
-DEPEND=""
-RDEPEND=""
-
-# Nothing to strip
-RESTRICT="strip"
-
-# suggested basedir for cliparts
-CLIPART="/usr/share/clipart/${PN}"
-
-src_unpack() {
-
-	unpack "${A}"
-
-	if ! use svg && ! use png && ! use pdf && ! use wmf; then
-		ewarn "No image formats specified - defaulting to all"
-	else
-		! use pdf && MY_REMOVE="${MY_REMOVE} pdf"
-		! use png && MY_REMOVE="${MY_REMOVE} png"
-		! use svg && MY_REMOVE="${MY_REMOVE} svg"
-		! use wmf && MY_REMOVE="${MY_REMOVE} wmf"
-	fi
-
-	! use doc && MY_REMOVE="${MY_REMOVE} txt"
-
-	export MY_REMOVE
-
-	MY_S="${WORKDIR}/openclipart-${PV}-"
-	if use wmf || use png || use pdf || use doc || ! use svg; then
-		MY_S="${MY_S}full"
-	else
-		MY_S="${MY_S}svgonly"
-	fi
-	export MY_S
-
-	cd "${MY_S}/clipart/"
-	einfo "Removing useless files..."
-
-	find \
-		\( -name "automatic" -o -name "move" -o -name "*.rdf" -o \
-			-name "*.spec" -o -name "*.log" -o -name "*.sxd" -o \
-			-name "*~" -o -name ".*.swp" \
-		\) -exec rm -f {} \; || die "Failed"
-
-	rm -f LICENSE.txt LOG.txt PASSFAIL README README.txt \
-		TODO index.xml keywords.idx || die "Failed"
-
-}
-
-src_compile() {
-
-	cd "${MY_S}/clipart/"
-	for ext in ${MY_REMOVE}; do
-		einfo "Removing files - ${ext}..."
-		find -name "*.${ext}" -exec rm -f {} \; \
-			|| die "Failed - remove"
-	done
-
-	if use gzip; then
-
-		einfo "Compressing SVG files..."
-		find -name "*.svg" -print0 | xargs -L 1 -0 \
-			bash -c 'gzip -9c "${1}" > "${1}z"; rm -f "${1}"' --
-
-	fi
-
-	einfo "Compressing docs..."
-	find \
-		\( -name "*.txt" -o -name "README" -o -name "AUTHORS" -o \
-			-name "COPYING" \
-		\) -exec gzip -9 {} \; || die "Failed - compress docs"
-
-}
-
-src_install() {
-
-	dodir "${CLIPART}" || die "Failed - dodir"
-
-	cd "${MY_S}/clipart"
-	find -type f -exec cp --parents {} "${D}/${CLIPART}" \; || \
-		die "Failed - install"
-
-	cd "${MY_S}"
-	dodoc LICENSE README NEWS VERSION ChangeLog
-
-}
diff --git a/media-gfx/openclipart/openclipart-0.20.ebuild b/media-gfx/openclipart/openclipart-0.20.ebuild
new file mode 100644
index 000000000000..668e29424450
--- /dev/null
+++ b/media-gfx/openclipart/openclipart-0.20.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openclipart/openclipart-0.20.ebuild,v 1.1 2009/08/08 10:37:03 maekke Exp $
+
+EAPI="2"
+
+DESCRIPTION="Open Clip Art Library (openclipart.org)"
+HOMEPAGE="http://www.openclipart.org/"
+
+SRC_URI="http://download.openclipart.org/downloads/${PV}/${P}.tar.bz2"
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="svg png gzip"
+
+# We don't really need anything to run
+DEPEND=""
+RDEPEND=""
+
+# suggested basedir for cliparts
+CLIPART="/usr/share/clipart/${PN}"
+
+src_compile() {
+	local removeext
+
+	if ! use svg && ! use png; then
+		elog "No image formats specified - defaulting to all (png and svg)"
+	else
+		! use png && removeext="${removeext} png"
+		! use svg && removeext="${removeext} svg"
+	fi
+
+	for ext in ${removeext}; do
+		elog "Removing ${ext} files..."
+		find -name "*.${ext}" -exec rm -f {} \; \
+			|| die "Failed - remove"
+	done
+
+	if use gzip; then
+		einfo "Compressing SVG files..."
+		find -name "*.svg" -print0 | xargs -L 1 -0 \
+			bash -c 'gzip -9c "${1}" > "${1}z"; rm -f "${1}"' --
+	fi
+}
+
+src_install() {
+	insinto ${CLIPART}
+	doins -r .
+}