From c5d9da89182b3e62f5173530fc6f39469d0be4a9 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@drexel.edu>
Date: Mon, 27 Feb 2012 21:28:30 -0500
Subject: [PATCH] Fix unpacking for joda-convert-1.1 ebuild.

The problem was pointed out by Darek as a side comment in bug #405923,
but my fix is slightly different than his proposed:

  unpack "${A}"
  mkdir joda-convert-1.1
  mv JodaOrg*/* joda-convert-1.1/
  S=$(pwd)/joda-convert-1.1
---
 dev-java/joda-convert/Manifest                 | 4 ++--
 dev-java/joda-convert/joda-convert-9999.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-java/joda-convert/Manifest b/dev-java/joda-convert/Manifest
index 66c57dd..066aec7 100644
--- a/dev-java/joda-convert/Manifest
+++ b/dev-java/joda-convert/Manifest
@@ -1,4 +1,4 @@
 AUX 1.1-build.xml 3819 RMD160 a6be19d47be61f5d2019cfb93d85318b56bcfc61 SHA1 d258b44e22445f77422567e660e04fc3f66f3426 SHA256 57571f3abdd51f9048acf47104a732aa4d6a3bbf7ae74221991dc5b64c335e59
 DIST joda-convert-1.1.tar.gz 24233 RMD160 f343caf5354f03c52e0e63d674db41af689a17ef SHA1 c0175fd89088e50a31e7ab46e6e36b45f9f81dde SHA256 dba2096aeffe59aa9268bddfb5102111f52f30b14a120118b5fd14f338af6657
-EBUILD joda-convert-1.1.ebuild 1412 RMD160 2bcaf9f43fbca2f417feeab6db1e63990427490a SHA1 bb3407cb22cff9c3e4cca0113e4802359b634107 SHA256 9c0f3818ae5b52fed06b879d3ae5b9af7bd77b5449ac3377d3107ea20279ff98
-EBUILD joda-convert-9999.ebuild 1412 RMD160 2bcaf9f43fbca2f417feeab6db1e63990427490a SHA1 bb3407cb22cff9c3e4cca0113e4802359b634107 SHA256 9c0f3818ae5b52fed06b879d3ae5b9af7bd77b5449ac3377d3107ea20279ff98
+EBUILD joda-convert-1.1.ebuild 1402 RMD160 f1fe8912a13b5e6ecf87b0f9ebdb045559772fc7 SHA1 d6d02573474ab5e2744540698d53a5a07f69e124 SHA256 68daf2f92e236f62b99f93c4c51257eb6a7e8ee7a70901e9ed246b4b400af455
+EBUILD joda-convert-9999.ebuild 1402 RMD160 f1fe8912a13b5e6ecf87b0f9ebdb045559772fc7 SHA1 d6d02573474ab5e2744540698d53a5a07f69e124 SHA256 68daf2f92e236f62b99f93c4c51257eb6a7e8ee7a70901e9ed246b4b400af455
diff --git a/dev-java/joda-convert/joda-convert-9999.ebuild b/dev-java/joda-convert/joda-convert-9999.ebuild
index 17d7726..61fb4ef 100644
--- a/dev-java/joda-convert/joda-convert-9999.ebuild
+++ b/dev-java/joda-convert/joda-convert-9999.ebuild
@@ -45,7 +45,7 @@ src_unpack() {
 		git-2_src_unpack
 	else
 		unpack "${A}"
-		mv *-"${PN}"-*/JodaConvert "${S}"
+		mv *-"${PN}"-*/* "${S}"
 	fi
 }
 
-- 
2.26.2