From c091b90ebf975794188951d5334216b9f5539c3f Mon Sep 17 00:00:00 2001
From: geos_one <geos_one@6952d904-891a-0410-993b-d76249ca496b>
Date: Tue, 2 Feb 2010 22:40:13 +0000
Subject: [PATCH] app-cdr/lightscribe-template: correct package naming

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/lightscribe@1925 6952d904-891a-0410-993b-d76249ca496b
---
 app-cdr/lightscribe-template/ChangeLog        |  4 ++
 app-cdr/lightscribe-template/Manifest         |  5 +-
 .../lightscribe-template-001-r1.ebuild        | 53 ----------------
 .../lightscribe-template-001.ebuild           | 60 +++++++++++--------
 4 files changed, 40 insertions(+), 82 deletions(-)
 delete mode 100644 app-cdr/lightscribe-template/lightscribe-template-001-r1.ebuild

diff --git a/app-cdr/lightscribe-template/ChangeLog b/app-cdr/lightscribe-template/ChangeLog
index 4eb769d..8d7360e 100644
--- a/app-cdr/lightscribe-template/ChangeLog
+++ b/app-cdr/lightscribe-template/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Feb 2010; Mario Fetka <mario.fetka@gmail.com>
+  ,lightscribe-template-001.ebuild, -lightscribe-template-001-r1.ebuild:
+  correct package naming
+
   05 Jan 2010; Mario Fetka <mario.fetka@gmail.com>
   +lightscribe-template-001-r1.ebuild:
   remove not needed inherits
diff --git a/app-cdr/lightscribe-template/Manifest b/app-cdr/lightscribe-template/Manifest
index 2b289df..1afde35 100644
--- a/app-cdr/lightscribe-template/Manifest
+++ b/app-cdr/lightscribe-template/Manifest
@@ -29,7 +29,6 @@ DIST TL_TravelPack001.tar.gz 4475046 RMD160 52d8df812cc2107be82afef651623e14af00
 DIST TL_TribalPack001.tar.gz 3494012 RMD160 845217d4fd4444caa6951f9c08fe32f0ea13a294 SHA1 b345cdae3f9170ce93e16797f59f56d19cfb8f70 SHA256 2a8e33088cda4812592564a029b7413de64500b2e2cbfd90a17f4e4fe7c5ec0b
 DIST TL_UrbanPack001.tar.gz 2118780 RMD160 b63f37d420f0a253af0fdcd22bf4a7e3d45cafc6 SHA1 f06e55ea7c3e3f03031c5758f5a6f1acb6ee5402 SHA256 dcf8366f433083418342ac220ee0e848a9f535a928c8e92ef795547c9d4d1479
 DIST TL_WeddingPack001.tar.gz 4959124 RMD160 f8b485f87dfe5565d358e9df0089ab6c878cf7f9 SHA1 92c5d3b74ff8765461a908d63ada74540977773c SHA256 ba3eaeaa59e4c939c0740dcc363139376daa376a95358317c33db26fc82a81d9
-EBUILD lightscribe-template-001-r1.ebuild 1071 RMD160 8914c0029e6ae09850a0288f6b6fd76ca25a7600 SHA1 3f1e53fca93de70eca00c5c71271baeeae079fc5 SHA256 18647684d658267e7be5782a9212c365938e64350f80c4ae4df5fa0fd825f8bc
-EBUILD lightscribe-template-001.ebuild 1073 RMD160 93592bc666db335b574f975438d372799e903443 SHA1 0924ecc1ae32ad5d1455ce08f393a46bf5aad90f SHA256 015fffe96f6311493d5679f897c05be04e4fae071b626ce8d5f0c40f128dc967
-MISC ChangeLog 333 RMD160 abf6b1345b8e126fe1c503e32b1db3aaebc23b54 SHA1 aace856405cd734d8909dc5ca416109a1f13ec35 SHA256 f1b5c9d81bf5832239e2268147df94ff6b4d3d2c5b8f3b25760f0ba2761e2003
+EBUILD lightscribe-template-001.ebuild 1249 RMD160 387d1274f94651dc6dc6efaf5ad80ce07f476eb0 SHA1 c2ef438c852a2636b27734f5c73539a7c8e50eb7 SHA256 78818abf8d0ff44e76de59a0fc804471aa477d068df658362772f03097beb381
+MISC ChangeLog 483 RMD160 253ac14623f2a586d8abc54d10ae876e5918e84a SHA1 ae089030545d73b4f9ee4dd1899be5e98bdeaedd SHA256 530700068a6b850ca36a0915d4c8bcf0720a51783e529417d92073dd7183400d
 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/app-cdr/lightscribe-template/lightscribe-template-001-r1.ebuild b/app-cdr/lightscribe-template/lightscribe-template-001-r1.ebuild
deleted file mode 100644
index 16fed9e..0000000
--- a/app-cdr/lightscribe-template/lightscribe-template-001-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils
-
-TL="Food-n-Family Hobby Floral KidsKorner
-    Business 9-to-5 Architecture
-    Art Fantasy Urban Tattoo Music Mythology Tribal StreetStyle KickinIt GrabBag
-    Sports Athletic Travel Animal Nature
-    Wedding SpecialOccasion Holiday Bridal Seasonal LifeEvents Celebration
-    Bonus QuickAndSimple"
-
-DESCRIPTION="Explore designs with the same themes, along with creative extras."
-HOMEPAGE="http://www.lightscribe.com/ideas/index_top.aspx"
-
-SRC_URI=""
-for a in ${TL}
-do
-	SRC_URI="${SRC_URI} http://download.lightscribe.com/ls/TL_${a}Pack${PV}.tar.gz"
-done
-
-LICENSE="lightscribe"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=""
-
-RDEPEND=""
-
-RESTRICT="mirror"
-
-src_unpack() {
-	for a in ${TL}
-	do
-		mkdir -p "${WORKDIR}"/${a}
-		cd "${WORKDIR}"/${a}
-		unpack TL_${a}Pack${PV}.tar.gz
-	done
-}
-
-src_compile() { :; }
-
-src_install() {
-	for a in ${TL}
-	do
-		insinto /opt/lightscribe/template/${a}
-		doins "${WORKDIR}"/${a}/*
-	done
-}
diff --git a/app-cdr/lightscribe-template/lightscribe-template-001.ebuild b/app-cdr/lightscribe-template/lightscribe-template-001.ebuild
index 1ae4892..153ac87 100644
--- a/app-cdr/lightscribe-template/lightscribe-template-001.ebuild
+++ b/app-cdr/lightscribe-template/lightscribe-template-001.ebuild
@@ -1,53 +1,61 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=2
 
-inherit eutils rpm multilib
+inherit eutils
 
+# Don't change the order they are grouped by upstream categories:
+# (easyer to add new template packages)
+# Home & Family
+# At the Office
+# Creative Concepts
+# Fun Outdoors
+# Special Occasions
+# Odds and Ends
 TL="Food-n-Family Hobby Floral KidsKorner
-    Business 9-to-5 Architecture
-    Art Fantasy Urban Tattoo Music Mythology Tribal StreetStyle KickinIt GrabBag
-    Sports Athletic Travel Animal Nature
-    Wedding SpecialOccasion Holiday Bridal Seasonal LifeEvents Celebration
-    Bonus QuickAndSimple"
+	Business 9-to-5 Architecture
+	Art Fantasy Urban Tattoo Music Mythology Tribal StreetStyle KickinIt GrabBag
+	Sports Athletic Travel Animal Nature
+	Wedding SpecialOccasion Holiday Bridal Seasonal LifeEvents Celebration
+	Bonus QuickAndSimple"
 
-DESCRIPTION="Explore designs with the same themes, along with creative extras."
+DESCRIPTION="Theme files for LightScribe"
 HOMEPAGE="http://www.lightscribe.com/ideas/index_top.aspx"
 
 SRC_URI=""
-for a in ${TL}
+for template in ${TL}
 do
-	SRC_URI="${SRC_URI} http://download.lightscribe.com/ls/TL_${a}Pack${PV}.tar.gz"
+	SRC_URI="${SRC_URI} http://download.lightscribe.com/ls/TL_${template}Pack${PV}.tar.gz"
 done
 
 LICENSE="lightscribe"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=""
+S="${WORKDIR}"
 
+DEPEND=""
 RDEPEND=""
 
 RESTRICT="mirror"
 
 src_unpack() {
-for a in ${TL}
-do
-	mkdir -p "${WORKDIR}"/${a}
-	cd "${WORKDIR}"/${a}
-	unpack TL_${a}Pack${PV}.tar.gz
-done
+	for template in ${TL}
+	do
+		mkdir ${template}
+		pushd ${template}
+		unpack TL_${template}Pack${PV}.tar.gz
+		popd
+	done
 }
 
-src_compile() { :; }
-
 src_install() {
-for a in ${TL}
-do
-	insinto /opt/lightscribe/template/${a}
-	doins "${WORKDIR}"/${a}/*
-done
+	for template in ${TL}
+	do
+		insinto /opt/lightscribe/template/${template}
+		doins ${template}/*
+	done
 }