3 files changed, 56 insertions, 110 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/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 .
+}