diff options
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/slf4j-log4j/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/slf4j-log4j/slf4j-log4j-1.6.1.ebuild | 7 | ||||
| -rw-r--r-- | dev-java/slf4j-nop/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/slf4j-nop/slf4j-nop-1.6.1.ebuild | 5 | ||||
| -rw-r--r-- | dev-java/slf4j-simple/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/slf4j-simple/slf4j-simple-1.6.1.ebuild | 6 |
6 files changed, 14 insertions, 10 deletions
diff --git a/dev-java/slf4j-log4j/Manifest b/dev-java/slf4j-log4j/Manifest index cae2681..4417a1f 100644 --- a/dev-java/slf4j-log4j/Manifest +++ b/dev-java/slf4j-log4j/Manifest @@ -1,2 +1,2 @@ DIST slf4j-1.6.1.tar.gz 1708903 RMD160 83e0aae3fc4e373883afda62e77555826814f613 SHA1 5e36f643453ead9e7816ba154909ff56d59b43a3 SHA256 62cd3614c84315304969f5d42a029d3dcc80017e1588f3b4357f01b1f50c4955 -EBUILD slf4j-log4j-1.6.1.ebuild 912 RMD160 244e527f19d3645d54283830817a083ae035e28d SHA1 a3de88718b38e5d75152669ebc369c3458f92a29 SHA256 039e2ce75405eba9e5064044a31b8f90aa2af8d2d5c19070ff4c1979a31c834e +EBUILD slf4j-log4j-1.6.1.ebuild 950 RMD160 210504c4260a25122418cd6efc2e7c583bf68705 SHA1 0b6ecb0af24a26451cb1bb43f6fd90b853aa3b93 SHA256 7dbe6e755efc30620e964936a468ba0bb2a1e8998a06881c4f31e6ebf8121fc2 diff --git a/dev-java/slf4j-log4j/slf4j-log4j-1.6.1.ebuild b/dev-java/slf4j-log4j/slf4j-log4j-1.6.1.ebuild index 470f4c6..cd72187 100644 --- a/dev-java/slf4j-log4j/slf4j-log4j-1.6.1.ebuild +++ b/dev-java/slf4j-log4j/slf4j-log4j-1.6.1.ebuild @@ -15,13 +15,14 @@ LICENSE="MIT" SLOT="0" KEYWORDS="amd64 ~ppc ppc64 x86" +COMMON_DEP="~dev-java/slf4j-api-${PV}:0" RDEPEND=">=virtual/jre-1.6 - >=dev-java/log4j-1.2" + ${COMMON_DEP}" -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEP} >=virtual/jdk-1.6 app-arch/unzip" - + S="${WORKDIR}/${P/-log4j/}" java_prepare() { diff --git a/dev-java/slf4j-nop/Manifest b/dev-java/slf4j-nop/Manifest index 84b95f4..44a5fee 100644 --- a/dev-java/slf4j-nop/Manifest +++ b/dev-java/slf4j-nop/Manifest @@ -1,2 +1,2 @@ DIST slf4j-1.6.1.tar.gz 1708903 RMD160 83e0aae3fc4e373883afda62e77555826814f613 SHA1 5e36f643453ead9e7816ba154909ff56d59b43a3 SHA256 62cd3614c84315304969f5d42a029d3dcc80017e1588f3b4357f01b1f50c4955 -EBUILD slf4j-nop-1.6.1.ebuild 917 RMD160 9d7a2e6800d476cc13c9609460a1c44dae5ae97e SHA1 7c8166dc8698e7692a9e37f4be6b3a133b518736 SHA256 38a78b5b870553bb185b8abcfe0d42330e951da68b5b3cfe9ce89bdcdd2f6406 +EBUILD slf4j-nop-1.6.1.ebuild 943 RMD160 a411f88a6858abba9bd27b3a41cd9ba1f6a589e1 SHA1 6cda13d27a4c462c033c57b2e84a0969dbe7401e SHA256 33429eec2ec0c9531f7f4da7a53e6cf69a8e2086928d7b4b4b820a1ec54af361 diff --git a/dev-java/slf4j-nop/slf4j-nop-1.6.1.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.6.1.ebuild index f271051..5866d32 100644 --- a/dev-java/slf4j-nop/slf4j-nop-1.6.1.ebuild +++ b/dev-java/slf4j-nop/slf4j-nop-1.6.1.ebuild @@ -15,10 +15,11 @@ LICENSE="MIT" SLOT="0" KEYWORDS="amd64 ~ppc ppc64 x86" +COMMON_DEP="~dev-java/slf4j-api-${PV}:0" RDEPEND=">=virtual/jre-1.6 - log4j? ( >=dev-java/log4j-1.2 )" + ${COMMON_DEP}" -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEP} >=virtual/jdk-1.6 app-arch/unzip" diff --git a/dev-java/slf4j-simple/Manifest b/dev-java/slf4j-simple/Manifest index 20b9404..7f8356a 100644 --- a/dev-java/slf4j-simple/Manifest +++ b/dev-java/slf4j-simple/Manifest @@ -1,2 +1,2 @@ DIST slf4j-1.6.1.tar.gz 1708903 RMD160 83e0aae3fc4e373883afda62e77555826814f613 SHA1 5e36f643453ead9e7816ba154909ff56d59b43a3 SHA256 62cd3614c84315304969f5d42a029d3dcc80017e1588f3b4357f01b1f50c4955 -EBUILD slf4j-simple-1.6.1.ebuild 890 RMD160 69b05e9ec8c8c55ceb989e2f3597718a73da8198 SHA1 de8879a424a16ed4abcfb54f064393b2aa9798b1 SHA256 2982c5abf8dc397c6f946d8f9f7a1869490f90d579f3865c62473a0b8a1dcc6b +EBUILD slf4j-simple-1.6.1.ebuild 949 RMD160 9ad87cd1860a2e56ce03affad0a99cd919262ff8 SHA1 231f835ec4b1301e331aec7a6c26d8e1e2506f9d SHA256 53b28c87856d81cc150c89187dc8ed2ad2274f9b5cf4c31333492fae3ac51d47 diff --git a/dev-java/slf4j-simple/slf4j-simple-1.6.1.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.6.1.ebuild index f70c2cd..0aca2d7 100644 --- a/dev-java/slf4j-simple/slf4j-simple-1.6.1.ebuild +++ b/dev-java/slf4j-simple/slf4j-simple-1.6.1.ebuild @@ -15,9 +15,11 @@ LICENSE="MIT" SLOT="0" KEYWORDS="amd64 ~ppc ppc64 x86" -RDEPEND=">=virtual/jre-1.6" +COMMON_DEP="~dev-java/slf4j-api-${PV}:0" +RDEPEND=">=virtual/jre-1.6 + ${COMMON_DEP}" -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEP} >=virtual/jdk-1.6 app-arch/unzip" |