fix: update categories rules to match PMS

Bug pkgcore#453.

That code's pre spec existance, and back when I was trying to
sell people on N>1 depth categories.

PMS allows some weird stuff, but add explicit tests for this.

Signed-off-by: Brian Harring <[email protected]>

Author: ferringb

src/pkgcore/ebuild/cpv.py

@@ -21,9 +21,9 @@
     r"^(?:\d+)(?:\.\d+)*[a-zA-Z]?(?:_(p(?:re)?|beta|alpha|rc)\d*)*$",
 )
 
-demand_compile_regexp(
-    "isvalid_cat_re", r"^(?:[a-zA-Z0-9][-a-zA-Z0-9+._]*(?:/(?!$))?)+$"
-)
+# see https://github.com/pkgcore/pkgcore/issues/453 for why this regex underscores
+# PMS Category names regex is directly replicated below.#
+demand_compile_regexp("isvalid_cat_re", r"^(?:[A-Za-z0-9_][A-Za-z0-9+_-]*)$")
 
 # empty string is fine, means a -- was encounter.
 demand_compile_regexp("_pkg_re", r"^[a-zA-Z0-9+_]+$")

tests/ebuild/test_cpv.py

@@ -1,6 +1,7 @@
 from random import shuffle
 
 import pytest
+
 from pkgcore.ebuild import cpv
 
 
@@ -20,19 +21,25 @@ def generate_misc_sufs():
 
 class TestCPV:
     good_cats = (
+        # see https://github.com/pkgcore/pkgcore/issues/453 .  PMS regex broke from pre spec allowing some weird stuff.
         "dev-util",
         "dev+",
-        "dev-util+",
-        "DEV-UTIL",
+        "DEV-UTIL+",
         "aaa0",
         "aaa-0",
-        "multi/depth",
-        "cross-dev_idiot.hacks-suck",
-        "a",
-        "foo---",
         "multi--hyphen",
+        "_dev",
+        "_",  # yep, that's legal.
+    )
+    bad_cats = (
+        "",
+        "-",
+        "+",
+        "dev-util ",
+        "multi/blah/depth",
+        "multi//depth",
+        "reject.a",
     )
-    bad_cats = (".util", "_dev", "", "dev-util ", "multi//depth")
     good_pkgs = (
         "diffball",
         "a9",